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

Change-Id: Ia3b7bbe2eea52628c01f2c54b39d06f798ff2445