Merge cherrypicks of ['googleplex-android-review.googlesource.com/28278701'] into 24Q2-release. Change-Id: I2afe81e8193d29c2cac1aaf9e523fe7856fb56e0