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

Change-Id: I0920a2c966b9ecc789c816f0fb1d9f98083a5460