Merge "Add MTP and PTP OS descriptors." into oc-mr1-dev