Merge "Fix the single crunch command to return the right error code." into jb-mr1-dev