[coastguard skipped] Merge sparse cherrypicks from sparse-12701944-L55000030008465871 into 24Q4-release.
COASTGUARD_SKIP: I5072051e95d215a88a4b86abd3c0ff29fa289d4f Change-Id: I9e74c17f23a51ebd3e4d95f5414c070c674299e9
This commit is contained in:
COASTGUARD_SKIP: I5072051e95d215a88a4b86abd3c0ff29fa289d4f Change-Id: I9e74c17f23a51ebd3e4d95f5414c070c674299e9