Merge cherrypicks of ['googleplex-android-review.googlesource.com/28051395', 'googleplex-android-review.googlesource.com/28050379', 'googleplex-android-review.googlesource.com/28104877'] into 24Q3-release.

Change-Id: I8fed772492005aa7094854d8fe71408a006b2090