Merge "Fix DeviceStateProviderImplTest create_invalidSensor" into tm-qpr-dev