Rename 'CategoryList' to 'Category' for consistency

Change-Id: I2e3637af38b789e588ce186497238f197e5fd5d3
Parse category names correctly

Category names containing colons now parse correctly.

Bug: 51902
Change-Id: If571bb9922399c5a5f77f0b304bec3f2b6f5f7dd
Merge changes If571bb99,I2e3637af

* changes:
  Parse category names correctly
  Rename 'CategoryList' to 'Category' for consistency