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

Change-Id: I9c42f46905e3b74a9e5743548eae8f4b35693f38