Merge "Write descriptors for Mtp in UsbService" into pi-dev