Merge cherrypicks of ['googleplex-android-review.googlesource.com/29663110'] into 25D4-release.

Change-Id: I2080948cd837da8e5f7da96fe2cd432f7cc37488