Merge "Add 20s timeout to 570-checker-osr."