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

Change-Id: I55ffbb864e13598933eaff3871d4d53331d9c055