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

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