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

Change-Id: I9ce7c73a4aeadedae9219614a16d8a72366303c9