Merge "Remove IpClient wrapper" am: 427f0c36d5
am: 62e8b4eb5c

Change-Id: I6b6eb186475228e6b6b6c1994ec4444a9160e19c