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

Change-Id: I86b39edefea5af2eee2b7fcd6a96417227f84221