[coastguard skipped] Merge sparse cherrypicks from sparse-12621605-L79200030007766629 into 24Q4-release.
COASTGUARD_SKIP: Ic3fccb5c51290587fdc3ea442ed2e83a0d65e714 Change-Id: I4830d760b994e3011edde8a12a086219a4d96fe0
This commit is contained in:
COASTGUARD_SKIP: Ic3fccb5c51290587fdc3ea442ed2e83a0d65e714 Change-Id: I4830d760b994e3011edde8a12a086219a4d96fe0