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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26445688', 'googleplex-android-review.googlesource.com/26418741', 'googleplex-android-review.googlesource.com/26462677', 'googleplex-android-review.googlesource.com/26463033', 'googleplex-android-review.googlesource.com/26458856', 'googleplex-android-review.googlesource.com/26460038'] into 24Q2-release.

Change-Id: I463972265fc3f4040e5b05d3252373440f2c3a40