Merge "Add a simple wrapper for IpClient." am: fa214ebcb8
am: 44ee418e07

Change-Id: Ie095557c98d7fc31d12cab5f63c8d2ae917dcc89