Merge changes Iddeebeb8,Idd1e37a3 into nyc-dev

* changes:
  WifiManager: Use ConnectivityThread
  Create ConnectivityThread