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

Bug: 385190204
Merged-In: I34332ec21c80690ccd4eda1d8f4ef916628a6485
Change-Id: Ifac2645172f1354517f0016edb4b879c6a97976d