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

Bug: 385190204
Merged-In: I2d7b02e2d8fbf84431da41163c39af1109fd835c
Change-Id: I6973dee2f061a3b1678d6471538321fd88aa4dce