Merge "Fix loading of cdex files."
am: 8d8cf2e609

Change-Id: I80969d8dd20d9bfaeda07c5749bb1538dbf64465