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