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

Change-Id: I71a2d7f6fb99ea74765a6d628b73ef39d0ccc2d7