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

Bug: 385190204
Merged-In: I1c5acde9514207aba7cabceeaca9ccbd8c7f461a
Change-Id: I6a1d965a56f4f370c3dc9971999fe34a32219e75