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

Change-Id: Iabc718818b5c6aea25e0269a6b66ebdb51475e7e