Merge cherrypicks of ['googleplex-android-review.googlesource.com/30936924'] into 25Q1-release.

Change-Id: I26310039d2d86ad104ea24afe0bfb625541e55cb