Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev