am f9d3020c: Merge "Clean up statemachine" into jb-mr2-dev

* commit 'f9d3020c575fd20097f599dc336a3b448415b7d7':
  Clean up statemachine