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