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

Change-Id: Ic26de0d5cf701647303e94f6ea1dae48ec4b1849