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

Change-Id: I0022a6bf36608fe0653c9306602197a4d78cd71a