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