Merge cherrypicks of ['googleplex-android-review.googlesource.com/29652892', 'googleplex-android-review.googlesource.com/29581113', 'googleplex-android-review.googlesource.com/29672426'] into 24Q4-release.

Change-Id: I7d379d5a333b0d52a72faed42401eda27f0a98b8