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

Change-Id: I41fce07514d2cae7268c4564f970b825eb1c7c49