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

Change-Id: I050cd0e4bc75f070144488582114aaca2c63175e