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

Change-Id: I5e493102d4b5ab56fe2567bb1ee55eaa32416f68