[coastguard skipped] Merge sparse cherrypicks from sparse-10807597-L55800000963065165 into udc-d1-release. COASTGUARD_SKIP: I48ef806f9f3ad4f5edb96b8f83a5bd23e04c22c6 COASTGUARD_SKIP: I397f91f472cda01a383bad5b0eee727eefe39f90 Change-Id: I586cba1a3452acab131a405bdb6ffce135a5f6ac