Fixup coding style for client Count*() API
Fixup coding style for client Count*() API

Change-Id: I63980aa00a7540498938ba5e80ba5bc35d956c35

jchris/indexing,jchris/indexing,jchris/indexing,jchris/indexing