Merge "Fix IpClientTest"
am: 5e823ab263

Change-Id: I25077d83d0821b9ba1449b7c1c716a44a71f7287