Update device management to better handle missing data on device update.