Merge cherrypicks of ['googleplex-android-review.googlesource.com/30154731'] into 24Q4-release.

Change-Id: Ifb5d6afcfd51eb80d7f5cb81d4ff10f086af525a