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

Change-Id: Iba1da3b5f49278b8a762194f0181d353cfb0d4d6