Update magical loading to work with current paths

Change-Id: I25749aad5f4e14b526ddc6e251d8d27fc564d078
Merge "Update magical loading to work with current paths"