Merge "Update RulesManagerService after APEX files"