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

Change-Id: Ie9bd4052164b22853ec19148178c97086f40227e