Merge cherrypicks of ['googleplex-android-review.googlesource.com/26332012', 'googleplex-android-review.googlesource.com/25839618', 'googleplex-android-review.googlesource.com/26551922', 'googleplex-android-review.googlesource.com/26567208', 'googleplex-android-review.googlesource.com/26637250', 'googleplex-android-review.googlesource.com/26307234', 'googleplex-android-review.googlesource.com/26720245', 'googleplex-android-review.googlesource.com/26703705', 'googleplex-android-review.googlesource.com/26882065', 'googleplex-android-review.googlesource.com/26906856', 'googleplex-android-review.googlesource.com/26929048', 'googleplex-android-review.googlesource.com/26932239'] into 24Q2-release.

Change-Id: I0fe91f3010e826c045f0127fc55deec6ae01569c