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

Bug: 385190204
Merged-In: Ie9dc52867de4b5b711e438702ab198fac33f139d
Change-Id: I1278a67375a0642b19cacb251deeec2ab756929e