Signed-off-by: Anda Xu <anda.xu@docker.com> (cherry picked from commit 308701fac6f716160283ca0868da59aba2ea7eb5) (cherry picked from commit b48afc216f46c8e786560b807528699012e1627b) Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Upstream-commit: b73fd4d936864998451cdd37f45694541e43006e Component: engine