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

Change-Id: I716d89f94fad32b853e6602d5b18803aad02b459