Merge "Disable parts of tuner from user builds" into oc-dev