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

Bug: 385190204
Merged-In: I99c949e20bd4e352083118bd8064042fed56cba1
Change-Id: I8f0f79882bc9879deaaceff5c0f210462717f0dd