Merge "Make users of MtpServer fill in DeviceInfo field values"
am: 933ea68aca

Change-Id: Iacecf43819f8cd6c0e8df7a53105e0538075c188