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

Change-Id: Iceb8f62b8e5c94409efdbeb05c08fd3b796d3dbb