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

Change-Id: Ia413b76ff8767e69f8a757e39d65c5aeb709b2c7