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

Bug: 385190204
Merged-In: Ic1c655f08f8db112d7575e2b66f27c9bb3a91ed0
Change-Id: I167c146959b09a48558dba86e21ced3197b1bb05