Make categories optional parameter

Change-Id: I5960de1b7e01db491046b89f08fd95324d24551d
Closes-Bug: #1311033
Merge "Make categories optional parameter"