Merge "Make users of MtpServer fill in DeviceInfo field values"