Merge "Make users of MtpServer provide DeviceInfo fields"