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