Merge cherrypicks of ['googleplex-android-review.googlesource.com/29656688'] into 25D4-release. Change-Id: I1510f99672c645ea2baf2c86240edc5e5b4b1479