cleaning up network connectivity admin

Change-Id: I331e83ef5f4ea5c0020f483e5b36e8f6db747e1c
Merge "cleaning up network connectivity admin"