Merge "Fix project files for DeviceConfig"