[coastguard skipped] Merge sparse cherrypicks from sparse-12212461-L77300030005792908 into 24Q3-release.

COASTGUARD_SKIP: I19d09268ffdffb471a347167c887316cd64f3ca6

Change-Id: I4e9bb16a0f3ee6ada04586590ed842ab7599097a