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

Change-Id: Idefff46119d1c04800624ffe4a594a120d726780