Merge "Make MtpService fill in MTP DeviceInfo fields"