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

Change-Id: If4181847424e4979228422ecc9ff231719908cd4