Merge cherrypicks of ['googleplex-android-review.googlesource.com/26398642', 'googleplex-android-review.googlesource.com/26597000', 'googleplex-android-review.googlesource.com/26728407', 'googleplex-android-review.googlesource.com/26923023'] into 24Q2-release.

Change-Id: Ic255bfe504ceac2e8b360823c7d2014079380524