Merge "Increase the IpClientTest timeouts to reduce flake rate."
am: 4e780bd992

Change-Id: I10bbe61a1518f9d2717aaf67e802a6fef7305853