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

Change-Id: I34fb8411a8150a5deef65c51a7e59317bedcd1ac