am e203384f: Merge "Disconnect from AP when teardown requested." into jb-mr2-dev

* commit 'e203384f1627f27c81ff72426498927fb9d80698':
  Disconnect from AP when teardown requested.