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

Change-Id: I1f8e35a6dca1aad66bdcbc1490c2d5493cc5666a