Merge "Add stub code to read MS OS 2.0 descriptors."