Merge cherrypicks of ['googleplex-android-review.googlesource.com/30869945'] into 25Q1-release. Change-Id: Ice990755acb8d1e898a9de6003712b842e53bcd7