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

Bug: 385190204
Merged-In: I6d966c713c7f702069d6c2189023c9db85a51fb8
Change-Id: Ia036819f777e4e97b7c092eb373dc77a991651e2