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

Change-Id: Ia66a457d3cb73c92c97de025348724fa3f5cbc55