Merge "Remove category from managedservices." into nyc-dev
am: 5961ab3

* commit '5961ab3ac5d64473d3224eb6c11563c347df178b':
  Remove category from managedservices.

Change-Id: Ib454ec3d289c7d8d506cae5c3c021135f7705079