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