Merge "Increase timeout to avoid flaky tests."