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

Change-Id: I15675e16af122b2518412ac9d5f513ea65f0f369