Merge "DozePlugin: Remove" into oc-dev