Merge 25Q1 (ab/12770256) to aosp-main-future

Bug: 385190204
Merged-In: Id541452e8b97991ef8c1b13aa94424fba8fe0095
Change-Id: If350db8d71074396b930f51702429ed7289e6493