Signed-off-by: Ri Xu <xuri@360.net> Upstream-commit: 87e8a936e82ecfbef59b829d8bbfca3fb4aa3163 Component: engine
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com> Upstream-commit: e89b6e8c2d2c36c43f22aeaf2a885646c2994051 Component: engine