Merge "Remove IpClient usage of NetworkManagementService"