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

Change-Id: Id1d607c26e2f72ff2e6dcfdb0bbafd8adb1c4e1c