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

Change-Id: If6559694d078aca8f2a8e2db44addd7d23f8a811