[coastguard skipped] Merge sparse cherrypicks from sparse-12621605-L35400030007607992 into 24Q4-release.
COASTGUARD_SKIP: I470e765ded52826376b74d3b263b2519ca625ef1 Change-Id: I830874ab9d95ff9ff41b01e734aedd3f2641c7a7
This commit is contained in:
COASTGUARD_SKIP: I470e765ded52826376b74d3b263b2519ca625ef1 Change-Id: I830874ab9d95ff9ff41b01e734aedd3f2641c7a7