Merge cherrypicks of ['googleplex-android-review.googlesource.com/35862232'] into 25Q4-release. Change-Id: I6d5530c00474c2fabfeffc359b8b4a31e745091e