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

Change-Id: Iaaa9e293de48fba89fb8d2fb2579685349a6e575