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

Change-Id: I4d2e14570b6c3fa7bcaa54db3583fdc52232031b