[coastguard skipped] Merge sparse cherrypicks from sparse-12553254-L49400030007650015 into 24Q4-release.

COASTGUARD_SKIP: I155fc8daf99581bfa29683ee5532b2be0fa92c2e

Change-Id: I5021de8533d78c0c01d7a9b7f475c88750059e16