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

Change-Id: I5840213d387a0df9d8a07491ae61e2b5c5ed0e5e