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

Bug: 385190204
Merged-In: Ic01bdfb0aa576edbd1d8020b11484454d858beda
Change-Id: I0a7408b283059c40a712e02139e0baa79e8f3329