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

Change-Id: Ibf79d4fb025c02c56c1ffe13fa017d4d72b9775b