Merge "Fix calcuation of CMD_TO_STRING_COUNT."