Merge cherrypicks of ['googleplex-android-review.googlesource.com/26229408', 'googleplex-android-review.googlesource.com/26239265', 'googleplex-android-review.googlesource.com/26243134', 'googleplex-android-review.googlesource.com/26241623', 'googleplex-android-review.googlesource.com/26241621', 'googleplex-android-review.googlesource.com/26240611', 'googleplex-android-review.googlesource.com/26464955', 'googleplex-android-review.googlesource.com/26465199'] into 24Q2-release.
Change-Id: I5445ca424fef2bb6ca5a04f0d701f0ff368858b0