Merge "Increase TEST_TIMEOUT_MS to 30s in the IpClientTest."