Merge 25Q1 (ab/12770256) to aosp-main-future Bug: 385190204 Merged-In: Ifb84cf462c466d036a776bbdf39d6bdae5a99703 Change-Id: I1c3b306d838b2b2965322d61b5fb58302c702b7f