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

Change-Id: I34a3fa11f5712acc43b7eb35d72b90ac10e7d81a