Merge cherrypicks of ['googleplex-android-review.googlesource.com/29916405', 'googleplex-android-review.googlesource.com/25187830', 'googleplex-android-review.googlesource.com/30930444'] into 24Q4-release.

Change-Id: I9a36239dce23b233439b0b2002a71ed6065a118c