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

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

Change-Id: I282bd15ba2465c5225933a22ebdcce4094bd36ea