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

Bug: 385190204
Merged-In: If0a8e085e7b9a87740d006089e3f81a2a3d60a6b
Change-Id: I0046142e047aba1353d9983980e56fb220787f19