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

Bug: 385190204
Merged-In: I29395b87ba329628730fe99f3fea6b5b0713df79
Change-Id: I9884ea0d01d126c66ae1e7027575d663c6b0351d