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

Change-Id: Ibc43a28e8b7fd42d3e631f1f42719c332a0f8918