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

Change-Id: I70b9b5c4e729703eaf44f9c5a7dee5fc315689ab