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

Change-Id: I5764307ec6bd3dc1d25057c1765e2be7e4aa72dd