[coastguard skipped] Merge sparse cherrypicks from sparse-11480754-L62600030002545018 into 24Q1-release.

COASTGUARD_SKIP: I5ebc65fcd00c7d5c593f8a56c8ccdfd424551005
COASTGUARD_SKIP: Ia80f451eb8a2f6fa63187de49ae6c7cdbc209aef

Change-Id: I78b6ffc6c4c85c0953b2ee12ced0840d21776dc6