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

Change-Id: I230e661d02086daad5372a39b44462a683f8a5b6