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

Change-Id: I2f38521ef2bed89c54e476f3984d3ebd6e6f1b7f