am c5c02f1d: (-s ours) am a831bff7: Restore STA reconnection behavior

* commit 'c5c02f1d8a39ff95f2a01e1cee7daf3c0ade6dbe':
  Restore STA reconnection behavior