Merge "Unbreak user builds" into oc-dev