[coastguard skipped] Merge sparse cherrypicks from sparse-11282838-L21100030001153269 into udc-d2-release.

COASTGUARD_SKIP: Ia93b3dc3d43f046dfb13c9422d2b28fe49c9b8b6
COASTGUARD_SKIP: Iab23d39013cec8644303c48cd093cb23359e1798
COASTGUARD_SKIP: If2339e1784d025902ec2ebd8d4f7c5980180846a

Change-Id: I24128602ee789513f440a8936a175fcf53ee4a3c