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

Change-Id: I6f11ca47c03560119519cde2c857d10cd3d37a4b