Merge "Increase IpClientTest verification timeout" am: 0cbdca3e20 am: 98e2f04ec0 am: 2b61800bfe
am: 3f6462a694

Change-Id: I1a7e26dbcc03630c461cecb07d1c858821ccff6d