[automerger skipped] Merge "cmds/service: Fix categoryCount"
am: c4d2f8aea7 -s ours
am skip reason: change_id Ie592a02c5baa1eb5527ddd8d726e3b1181d937fd with SHA1 cc5f51751b is in history

Change-Id: Ie9c85ce1d3d516c91d1141a6aeb290964d55ea24