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

Change-Id: I13926b884509c4018d8ced24a80acc3e8c2b5d7a