[coastguard skipped] Merge sparse cherrypicks from sparse-13787996-L64100030014412350 into udc-platform-release. COASTGUARD_SKIP: Ie6d24f9903b143568a3ff9b6914d49b63a3a6175 COASTGUARD_SKIP: I4ccf22f85b4ae0325e9f8e29503149bbda533e86 Change-Id: I9f44cb3e9f0ca9c85e551853ee9d72348c6b8036