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

Change-Id: Ife493b04fa1700cb4da00b8743825e28f70fae2b