Have the entry point make sure the dependencies are loaded

Change-Id: I44c7c7f87f2908264137ca758f3329f781fa606c
Merge "Have the entry point make sure the dependencies are loaded"