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