Merge "Fix tracing call for RulesManagerService startup" into oc-mr1-dev