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

Change-Id: I0024228c755a822f450f7d44506d00ecb7b506a0