Merge cherrypicks of ['googleplex-android-review.googlesource.com/30134293', 'googleplex-android-review.googlesource.com/30153908', 'googleplex-android-review.googlesource.com/30200589'] into 24Q4-release.

Change-Id: I32459190d4938abf8c3eacd52754a41d1ed3f88f