Merge "disable module loading after BOOT_COMPLETED broadcast" into oc-dev am: a02b1f5bed
am: 00b0b347a0

Change-Id: I62f0b7d807a96276d08d13adcd758d126a509c39