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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26635185', 'googleplex-android-review.googlesource.com/26635186', 'googleplex-android-review.googlesource.com/26681729', 'googleplex-android-review.googlesource.com/26685062', 'googleplex-android-review.googlesource.com/26709389', 'googleplex-android-review.googlesource.com/26735320'] into 24Q2-release.

Change-Id: I3992eb9dc9d0345063f4833f8190c6d56c2dc46e