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

Change-Id: I1279157cc41d491147b495ef96cda0efbc2579f1