Merge "Increase IpClientTest verification timeout"
am: 0cbdca3e20

Change-Id: I214df25ed178d859ae60d765c94fc9d6a25408ee