Merge "Fix IpClientTest" am: 5e823ab263 am: 3d212804df
am: 3b37567d12

Change-Id: If84e339670087d4484542801c361c7e70ee01793