Merge "Changing DeviceInfo fields to be mandatory."