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

Bug: 385190204
Merged-In: I422e2a57a4941d8d73fba0eebb72cad707001266
Change-Id: I554e4802604fc7932e22cac7fa13649a24bdf963