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

Change-Id: I8b1d87000c096bca974cc308b1f38d503c073dd4