Merge "Alter condition for starting RulesManagerService"