Fix DeviceInfoProvider
