Merge 25Q1 (ab/12770256) to aosp-main-future Bug: 385190204 Merged-In: If221d194a32a2f84c411cbb440b1a359f0aa27ec Change-Id: Ie2035d975e8ba2b7812de756dc87aadf20b0392a