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

Change-Id: I1a64063b706cc6570bcbaaee5a204c611837b72a