Merge "Add StateMachine make methods." into jb-mr1-dev