Update dependency checks and magic loading

Change-Id: If3720f0e914ff97f0a16c2487065fda42889f076
Merge "Update dependency checks and magic loading"