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

COASTGUARD_SKIP: I8183a2b9533efd9721b8e539d461e1c6455748d0
COASTGUARD_SKIP: Ie011c5ffbf94f284f7ad16f2fa0f566efe51dd51

Change-Id: I547d719d122863e0b991378dee431b2fa865014c