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

Change-Id: Idfb517c8665f813838ce312a8b67bd33656ce1e2