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

Change-Id: I93ab211333ab1c1c8fd82bf2d692cc9ad2055b62