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

Change-Id: I226a1a06b3029db375d353214d70a262fe0f43cf