Merge cherrypicks of ['googleplex-android-review.googlesource.com/29878325',...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/29878325', 'googleplex-android-review.googlesource.com/29878326', 'googleplex-android-review.googlesource.com/30153909', 'googleplex-android-review.googlesource.com/30519371'] into 24Q4-release.

Change-Id: I1325874594ea73e1837f19e6797d1753b46898a3