[coastguard skipped] Merge sparse cherrypicks from sparse-12647708-L62500030007877732 into 24Q3-platform-release.

COASTGUARD_SKIP: Iad06dc69c5bf5ccda476e89ed9b0fc1bc63d2ebe
COASTGUARD_SKIP: Ic49d0aa28b0cf76a98f5f237c83a2c78f3a76c66
COASTGUARD_SKIP: Ia9000bcbb5b3b9e1e0d396ba78946be36e2fc5ba

Change-Id: Ic4828a2f7ae9a64c28489198aeab549a1c15d7cb