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

Change-Id: Ic311bb2906ad81b79cfd0c9d4f5487d5dc3f01c8