Merge "When we disconnect shutdown the StateMachine. DO NOT MERGE" into jb-dev-plus-aosp