Comment device_query + rename DeviceInfoValue to DeviceInfoWrapper