[coastguard skipped] Merge sparse cherrypicks from sparse-11973172-L31400030004671065 into 24Q2-release.

COASTGUARD_SKIP: I41b523bb538f0fdcd7ea5814822b3bd177f750c2
COASTGUARD_SKIP: I0bcd3ba4ad5ee89653447e8119868deec2175a07

Change-Id: I797e08c7b499d19a36fcf9e537537509daea58f3