[coastguard skipped] Merge sparse cherrypicks from sparse-12453015-L78200030007023599 into 24Q4-release.
COASTGUARD_SKIP: I940eb76509096eabb8119a9cc6ca2d4dd3971e19 Change-Id: Ic9b4f755f84994d5b17a84c483202282820ec93f
This commit is contained in:
COASTGUARD_SKIP: I940eb76509096eabb8119a9cc6ca2d4dd3971e19 Change-Id: Ic9b4f755f84994d5b17a84c483202282820ec93f