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