Merge "remove enableFirmwareLogs"