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