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

Change-Id: Ib0893d73fd1cabeb055e1dfd33f030bc9a280d00