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