Merge cherrypicks of ['googleplex-android-review.googlesource.com/29657154', 'googleplex-android-review.googlesource.com/29727952', 'googleplex-android-review.googlesource.com/29733476', 'googleplex-android-review.googlesource.com/30023834'] into 24Q4-release.

Change-Id: I43e95df3197859f16214d96f5dbfb9ad704b0cb4