am 1fe7a813: (-s ours) Merge "Enhance StateMachine Quitting and logging support. DO NOT MERGE" into jb-dev-plus-aosp

* commit '1fe7a81383a0b7c87be2cc4291e1ede9d85bf819':
  Enhance StateMachine Quitting and logging support. DO NOT MERGE