[coastguard skipped] Merge sparse cherrypicks from sparse-11344512-L86400030001654717 into udc-d2-release. COASTGUARD_SKIP: Icc854699f8577fc9c92bad2ef63bb1d717c68924 COASTGUARD_SKIP: I96051e58376b559b342b59502acdcfc8a838c460 Change-Id: I1cd30ba64112ddc34350ecc955ce9169ecdc4e7b