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

Change-Id: I9ad148c8117897f49f34aed5e22935f5dbaf77d0