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