Merge "Remove IpClient usage of NetworkManagementService" am: 9fe79edfd2
am: 3af3f76129

Change-Id: I56ab41ca39dc745554534f3e85f5fc4257cc902a