Merge changes Ifd7d73ad,Id79096fa

* changes:
  Bugfixes in LinkProperties#toString
  Cleanup of ConnectivityManager.