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

Change-Id: I0aa8e1ad1f4ee79f901409de0f021b3d58b8e879