Merge cherrypicks of ['googleplex-android-review.googlesource.com/26388507', 'googleplex-android-review.googlesource.com/26477996', 'googleplex-android-review.googlesource.com/26518061'] into 24Q2-release.

Change-Id: I09a1814b36ff1e4a7175aebd19ca11e884fd03c5