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

Change-Id: I3ee6a4fc5f18e8dabc172c6b13bc53969750165a