Merge cherrypicks of ['googleplex-android-review.googlesource.com/26244920', 'googleplex-android-review.googlesource.com/26244786', 'googleplex-android-review.googlesource.com/26247061', 'googleplex-android-review.googlesource.com/26465466'] into 24Q2-release.
Change-Id: Ic81ce3d5dadf8f2d570b988871290093a6f702b0