[coastguard skipped] Merge sparse cherrypicks from sparse-12399983-L32400030006611955 into 24Q4-release.
COASTGUARD_SKIP: I4cb02421def7e7ac7964b851c3546a988f4446c5 Change-Id: I6e916395d6c61b7858b34524b06cfe91c943bb4a
This commit is contained in:
COASTGUARD_SKIP: I4cb02421def7e7ac7964b851c3546a988f4446c5 Change-Id: I6e916395d6c61b7858b34524b06cfe91c943bb4a