[coastguard skipped] Merge sparse cherrypicks from sparse-9959432-L40100000960074027 into udc-release.
COASTGUARD_SKIP: Ie26b73e1e9584f632625375d36168a42e95e5f02 COASTGUARD_SKIP: I30bae960085910cda59d6a144a38c0e38f95651e Change-Id: If65da8f6cf241dc6aba132f307d62f916bb8a3fb
This commit is contained in: