Merge "Increase timeout for no-image runs."