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

Change-Id: I541a98c3496b32a23c87749b2267858549e0eae5