Merge cherrypicks of ['googleplex-android-review.googlesource.com/26832999',...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26832999', 'googleplex-android-review.googlesource.com/26877731', 'googleplex-android-review.googlesource.com/26877737', 'googleplex-android-review.googlesource.com/26877738', 'googleplex-android-review.googlesource.com/26878334', 'googleplex-android-review.googlesource.com/26878335', 'googleplex-android-review.googlesource.com/26878463', 'googleplex-android-review.googlesource.com/26878464', 'googleplex-android-review.googlesource.com/26878465', 'googleplex-android-review.googlesource.com/26878466', 'googleplex-android-review.googlesource.com/26878737', 'googleplex-android-review.googlesource.com/26878738', 'googleplex-android-review.googlesource.com/26878741', 'googleplex-android-review.googlesource.com/26878828', 'googleplex-android-review.googlesource.com/26878829', 'googleplex-android-review.googlesource.com/26878830', 'googleplex-android-review.googlesource.com/26878831', 'googleplex-android-review.googlesource.com/26878834', 'googleplex-android-review.googlesource.com/26879463', 'googleplex-android-review.googlesource.com/26879775', 'googleplex-android-review.googlesource.com/26879790'] into 24Q2-release.

Change-Id: I6cd90cf3773399322d27937356dad219c1816d7d