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