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

Change-Id: Ibfed77a5407c613751a545bc69e6d958606f946a