Merge "Make MtpService fill in MTP DeviceInfo fields" am: 792f244db4
am: 20c80cbf9a

Change-Id: I58890c4b7a36684017f8da22854fe1d3eec477d9