[coastguard skipped] Merge sparse cherrypicks from sparse-12701944-L83700030007960137 into 24Q4-release.

COASTGUARD_SKIP: Id7041f37610385bf27b712bd960bd9ce4cac5bb2

Change-Id: Iaba8cc1d08f5693d7651424e861c75c922cafc41