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

Change-Id: Icaa778d354c4821ab26b2b8a523616b1b6bfca49