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