Merge cherrypicks of ['googleplex-android-review.googlesource.com/29673278', 'googleplex-android-review.googlesource.com/29669026', 'googleplex-android-review.googlesource.com/29669027', 'googleplex-android-review.googlesource.com/29706942'] into 24Q4-release.

Change-Id: Ia05eba3ca8000805b1b50abf9638d86a7f291e64