NetworkManager Changes and DeviceInfo changes