Merge "Move DeviceConfig to configinfrastructure module"