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

Bug: 385190204
Merged-In: Ic8968225ff8d8a6131507cfa0f9814afd1745e23
Change-Id: Ia64aa7a2a0f6f7df3fdbeed3c1a0e9b6b0d73066