Merge "Revert "Increase timeout for the 570-checker-osr test from 20s to 60s.""