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