Merge cherrypicks of ['googleplex-android-review.googlesource.com/22789883'] into tm-qpr3-release. Change-Id: Ic51ea92f7aa45d657af9c293e225e32690047a52