Merge "Add stub code to read MS OS 2.0 descriptors." am: c8eadff1de
am: d0e328be96

Change-Id: If5c989359b31a9407fdc0ecbaf036a0afd1a53a2