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

Change-Id: I7dd37e95530b4a5dbe7b4980462330568a2f0a78