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

Change-Id: I349345417881d8fdea10c83c23b76876939a0342