Merge cherrypicks of ['googleplex-android-review.googlesource.com/26740266', 'googleplex-android-review.googlesource.com/26719581', 'googleplex-android-review.googlesource.com/26722594', 'googleplex-android-review.googlesource.com/26722595', 'googleplex-android-review.googlesource.com/26723320', 'googleplex-android-review.googlesource.com/26723396', 'googleplex-android-review.googlesource.com/26723578', 'googleplex-android-review.googlesource.com/26723590', 'googleplex-android-review.googlesource.com/26723629', 'googleplex-android-review.googlesource.com/26723632', 'googleplex-android-review.googlesource.com/26723690', 'googleplex-android-review.googlesource.com/26723691'] into 24Q2-release.
Change-Id: I33a6a2496315e1483790e9f3845a435d6f14c307