[coastguard skipped] Merge sparse cherrypicks from sparse-11942872-L82900030004355486 into 24Q2-release.
COASTGUARD_SKIP: I7911f66d435847515a33c9caa71945bfc9e8b41b COASTGUARD_SKIP: Ie294dbfad34544b20386d019edf8d24819aa1f6d COASTGUARD_SKIP: I984a575909fd74ba78148bf39b5a109ecbf7bc3f Change-Id: I47257fb00585200b22a30000bee2ade19f85d1a2
This commit is contained in: