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

Change-Id: I3cd14d5a8c2c86acfb57027b5c6df2cf98fe039b