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

Change-Id: I931d9ee084216c6db1bf42c97873781f149e8b9e