am 2a2d5e0b: (-s ours) Merge "When we disconnect shutdown the StateMachine. DO...
am 2a2d5e0b: (-s ours) Merge "When we disconnect shutdown the StateMachine. DO NOT MERGE" into jb-dev-plus-aosp
* commit '2a2d5e0b':
When we disconnect shutdown the StateMachine. DO NOT MERGE