Merge "Disable checker when testing no-prebuilds" into oc-dev
am: 50804941fd  -s ours

Change-Id: I48bab7bedb9aa65b1945f3134354bfb6ad61a61f