Bug 837137 - Fix some errors in commandId usage, r=mdas, a=test-only