Ensure we normalize the device id.