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

Change-Id: I2e930d54df6d27b48de900155ccf633caa2c1d69