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

Change-Id: I3ec0177b6f7d7e479c6baae799ebec47fcf0d4c2