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

Change-Id: Idf1ac1623593dd6769be2b0e5807dead3ea1eb7d