Merge "Revert "Increase timeout for the 570-checker-osr test from 20s to 60s."" am: 44349d99
am: 7331807a
* commit '7331807a':
Revert "Increase timeout for the 570-checker-osr test from 20s to 60s."
Change-Id: Idcf65ca9ef65945441d08cb3cce10cb49fe35164