Merge "disable module loading after BOOT_COMPLETED broadcast" am: 20b7f78204 am: 65c8cb8935
am: f560cc78af  -s ours

Change-Id: I8fcb09242263cd4c068c86ed4e5f80c5ff0b47cb