Merge changes I6d5dd0a8,I106b3e4f

* changes:
  Use public API Network#getNetId() to get netid
  Remove unused import IConnectivityManager
tree: 675beae8956bc922ed9fb8c0fe79b641ceca198d
  1. core/
  2. services/