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