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

Change-Id: I514e5842e5fa2564a6d9358af3d8a0c5ad8f796f