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

Change-Id: I4edab026a2e4b77e3413a41bfdd99d728c5e5a61