Merge cherrypicks of ['googleplex-android-review.googlesource.com/39531395'] into 26Q2-release.

Change-Id: Ic7ea086a91349c9c05b79750b474cf2d03d52d6f