Merge "Increase TEST_TIMEOUT_MS used in the integration test."