Merge "Remove timeout for the 570-checker-osr test"
am: 2badb9a4c2

Change-Id: Ia3cf5487b6d8251759fbc8128eb794cbf236bad5