Merge "Remove category from managedservices." into nyc-dev