Merge "Add an option to skip 3rd-party input tests" into oc-dev