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

Change-Id: I15848d8180ec4551b634680efe686d9a46d5f652