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

Change-Id: I59c7c439340cdbd89e668d3ee4a7e57c03727d34