Merge "Support parsing of data descriptor" am: fcf2d8b89b

Change-Id: I4e93b4535f8d7d268aed2b3396f2008687fedb5b