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

Change-Id: I84f3268cac0e36c04cc31f69463819ad4d2c7739