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

Change-Id: Iabbde3d401c42ccce07c52fc536b0757a2587a6e