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

Change-Id: I41a6ffe51c2b0a9a7e5ef1ed880b33c365a2d508