[coastguard skipped] Merge sparse cherrypicks from sparse-14491201-L17700030063614037 into udc-platform-release. COASTGUARD_SKIP: I6efecac362757c10b2308d020440eac5edc5b873 COASTGUARD_SKIP: I68eeda016e1b51355e184fe4b12a7fe04b961361 Change-Id: I34884ae04f328cd632a3b46a950c241854ed6c39