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

Change-Id: I0163b9389517a84f7d108d0d129b9419a2f14cee