Merge "Add 20s timeout to 570-checker-osr." am: 748ad81 am: 522354b
am: e85230a

* commit 'e85230af78dc3e803080c6138b2bb683bfb35d49':
  Add 20s timeout to 570-checker-osr.

Change-Id: I2da9aa67ed8bc09bc6e8945c4ce7d27acdffd173