Merge 24Q3 (ab/11976889) to aosp-main-future Bug: 347831320 Merged-In: Id489407a31e7b5ca7681b1d17f5ef1b69d4d34a4 Change-Id: I677612b62208d5d4d03552c61f703663b74ff629