[coastguard skipped] Merge sparse cherrypicks from sparse-12545800-L45200030007355649 into 24Q4-release.
COASTGUARD_SKIP: If123cfb1e3b395c5f619a543e2413a9b02a6d448 Change-Id: I05bb5160562bb4b187300bbb4af675ff74f710c6
This commit is contained in:
COASTGUARD_SKIP: If123cfb1e3b395c5f619a543e2413a9b02a6d448 Change-Id: I05bb5160562bb4b187300bbb4af675ff74f710c6