Merge cherrypicks of ['googleplex-android-review.googlesource.com/23077069'] into tm-qpr3-release.

Change-Id: Ie4f57f15fc97b03462873751b8f5f302e59868f2