Merge cherrypicks of ['googleplex-android-review.googlesource.com/28087371', 'googleplex-android-review.googlesource.com/28100816', 'googleplex-android-review.googlesource.com/28071702'] into 24Q3-release.

Change-Id: Ica8123c7671ec2ab1af003031d925570d8d6add7