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

Change-Id: I83942cf3865210b4947583f833642a5714181a1b