Fix module loads to be in the hook

Were having issues with module dependencies. Fixed now.

Bug: 54338
Change-Id: Iaa68cfa0cd86592bd1749769ac14e552528ceffd
Merge "Fix module loads to be in the hook"