Merge cherrypicks of ['googleplex-android-review.googlesource.com/26247514', 'googleplex-android-review.googlesource.com/26245009', 'googleplex-android-review.googlesource.com/26247753', 'googleplex-android-review.googlesource.com/26247614', 'googleplex-android-review.googlesource.com/26247042', 'googleplex-android-review.googlesource.com/26244766', 'googleplex-android-review.googlesource.com/26464752', 'googleplex-android-review.googlesource.com/26465726'] into 24Q2-release.
Change-Id: Iec3ed20f24b4d8ad6bb6b2560d4aac8546246978