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

COASTGUARD_SKIP: I26138ee9f8e7cdb45cafe2446dc4d1e3d6d8347f
COASTGUARD_SKIP: I38720247bf3f5ca08e59bcc570558e456c88c411

Change-Id: I40c5312a682bc2800e6cc6f5a6d2bcc3cf0eac16