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

Change-Id: Ic774340a36d199f6e2e884e67322e1039111d316