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

Bug: 385190204
Merged-In: I592eed13a7e1500675366dea62003ea8b04736f6
Change-Id: Ifa0015af0b073921c06da1d64a87b2559417af39