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

COASTGUARD_SKIP: I0bcd3ba4ad5ee89653447e8119868deec2175a07
COASTGUARD_SKIP: I37b98d23fc46de6eaafef85fc76bbde76ed7c4bf

Change-Id: I18d62c57b9289506673b65507d98ceadb91555ec