network/DeviceInformation.java, NetworkService.java updated