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

Change-Id: Ie88b555e46eba6760851674f599fa80d9fe1f7be