Merge changes I6d5dd0a8,I106b3e4f

* changes:
  Use public API Network#getNetId() to get netid
  Remove unused import IConnectivityManager