Merge cherrypicks of ['googleplex-android-review.googlesource.com/27586565', 'googleplex-android-review.googlesource.com/26824327', 'googleplex-android-review.googlesource.com/28319740'] into 24Q3-release.

Change-Id: I77bc9ca4e35a5e448570c5de0e83ea05f4774702