Merge "Enable MS OS descriptors for adb."