Merge 25Q1 (ab/12770256) to aosp-main-future Bug: 385190204 Merged-In: Ic2507fd1fdefb74e2b0bddf93715b74d1b3dd908 Change-Id: Icb616fb5fd9a37cd28754742b3397fa5cb379596