Merge "Set higher timeout for tests in scenario jobs"