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

Change-Id: I3d8a93b1df256057a222837d837962ce9a2a1e73