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

* commit 'bfadb84f9d44ee2f74db394cec431059201b0086':
  Clean up statemachine