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

Change-Id: I661d81ce9d669cbb4a328da33746092b4ec0c0b6