[coastguard skipped] Merge sparse cherrypicks from sparse-12342007-L29200030006336399 into 24Q4-release.

COASTGUARD_SKIP: I328f6571e81cc1a3fd4c9616a0382c320cf63a71
COASTGUARD_SKIP: I538d02210cb9196c395f91a44d32aba2916b3a50

Change-Id: I792df8d407e02712d83998d82d0483207e53bd68