Merge changes I99ce72bd,I5a11a802

* changes:
  Add retries for WifiManager#connect
  Use WifiManager.connect to reconnect wifi