Update magical loading code so it keeps working after DataValues split

Change-Id: I4c60a10ec0094bb2a24e5c04185306ad51a28a64
Merge "Update magical loading code so it keeps working after DataValues split"