Merge "Alter condition for starting RulesManagerService" into oc-mr1-dev