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

Change-Id: I98b6dde5c56f847b2ab7e0a64caacb9ac01c5417