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

Change-Id: I57684821f09bb3d5f85a140cc222b13271f7f625