[coastguard skipped] Merge sparse cherrypicks from sparse-10502572-L39700000962039696 into udc-release.

COASTGUARD_SKIP: If0736e504928641c85934eae4d298f14e711116c
COASTGUARD_SKIP: Ia90e3f84f6772d746c8707476e9ca2de19f17aec
COASTGUARD_SKIP: If7e9e5f99728c2f3a18b08346b4cf3449132f920

Change-Id: Icf1c83901eb155ac0df483d2e477baa10961bc6a