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

Change-Id: Ie6abb25047e7a25237602ed69c7752801f6a079d