Signed-off-by: Daniel Nephin <dnephin@docker.com> Upstream-commit: 065118390a3ecaf0dbd2fa752d54d43f8f1e8ec6 Component: engine