[coastguard skipped] Merge sparse cherrypicks from sparse-11555370-L22300030002426335 into 24D1-release. COASTGUARD_SKIP: If936de9f144ebdf6e90d4f36626192ffdfeb46af COASTGUARD_SKIP: I9b477ffb9cbc6e49130cf5a4a6241e09c02de94f Change-Id: I21392b93cb602f93bddc9e2422db537d4f15a8b7