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

Bug: 385190204
Merged-In: I2a904a81130ec40602ac7e44e1b1435cd1d54d8f
Change-Id: Ie61d5554cdf28aabc4e2d366e9c5681e9b0fdf21