am bab00057: am c6f2d17a: Merge "Add mHasQuit to fix an NPE in StateMachine." into jb-mr2-dev

* commit 'bab000578d7ad6b380c558f28685d2303b64abc8':
  Add mHasQuit to fix an NPE in StateMachine.