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