[coastguard skipped] Merge sparse cherrypicks from sparse-11566203-L22400030002430485 into 24D1-release. COASTGUARD_SKIP: I761c9e365924e3ffc5fd1c2d430b3220f791926e COASTGUARD_SKIP: I0f3d08953b882d49c6839430531b3d64789865f8 COASTGUARD_SKIP: Ie946e64b00f24af196dcc0d5d9f919b03f57d96a Change-Id: Icacfc621fa8bc9bcbac4014617e1864f751e138c