Merge "Fix in-memory loading of cdex files with shared data." am: d663ef9772
am: 29379fa494

Change-Id: I3d1731b7c0e28e4a743d128785a88242721b294e