Update for docker checkpoint Upstream-commit: cbc511720ab13bff05a66c9fa72f5354b2c7bc94 Component: engine