Merge cherrypicks of ['googleplex-android-review.googlesource.com/29660348', 'googleplex-android-review.googlesource.com/29655974', 'googleplex-android-review.googlesource.com/30490227'] into 24Q4-release.

Change-Id: Ic99f0e34b71c1a88ce6a8ac62eb5898ccc57b2c4