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

Change-Id: I1c6970c578194634311cd22e408f886eb7c9cda8