Merge cherrypicks of ['googleplex-android-review.googlesource.com/27902855', 'googleplex-android-review.googlesource.com/27951519', 'googleplex-android-review.googlesource.com/27976521'] into 24Q3-release.

Change-Id: I700dccc620c1f24e25094d8bd240156d4459e877