Merge cherrypicks of ['googleplex-android-review.googlesource.com/26623958', 'googleplex-android-review.googlesource.com/26350308', 'googleplex-android-review.googlesource.com/27596965'] into 24Q2-release.

Change-Id: Ie94ff616b03664caeacf4934f0b0814928951199