Merge cherrypicks of ['googleplex-android-review.googlesource.com/29547455', 'googleplex-android-review.googlesource.com/29547868', 'googleplex-android-review.googlesource.com/29573317'] into 24Q4-release.

Change-Id: Idc803923e63c9f259f2b453c782919b7c353c4a9