Merge "disable module loading after BOOT_COMPLETED broadcast" into oc-dev