CB-7656 Fixes list-devices and list-emulators commands