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

Change-Id: I3215df8c0b8b9733db1941bbe15d6ff4159f99ce