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

Bug: 385190204
Merged-In: I94c9c231c6aee83031a95babce5f8068e52b6227
Change-Id: I9a0062166e4140df6cc3a5053151a99e7d7b560d