Don't append the container id to custom directory checkpoints. Upstream-commit: f72b180ae1f638b878edfbae1b7030f454bb5624 Component: engine