Merge cherrypicks of ['googleplex-android-review.googlesource.com/26909021', 'googleplex-android-review.googlesource.com/26968636', 'googleplex-android-review.googlesource.com/26970063'] into 24Q2-release.

Change-Id: Ica24dd1bd4de67fefdb5602bfa2ea3f0a1f96755