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

Change-Id: Ie92145984fdba93182d5d33cd390f5f4db116204