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

Change-Id: I369c6f2865357259adb3bac8dad966734f021072