[coastguard skipped] Merge sparse cherrypicks from sparse-12396123-L06400030006591465 into 24Q4-release.
COASTGUARD_SKIP: Ie8ee66b4beb1c1f4beff1a91fe13c75f889bcb9f Change-Id: Ibe8480d8fdac2d2fb23a799dc6432256bf010efc
This commit is contained in:
COASTGUARD_SKIP: Ie8ee66b4beb1c1f4beff1a91fe13c75f889bcb9f Change-Id: Ibe8480d8fdac2d2fb23a799dc6432256bf010efc