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

Change-Id: If803b9745b25795ef9b3be460df3eda2257da5a2