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

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