Merge "disable module loading after BOOT_COMPLETED broadcast" am: 20b7f78204
am: 65c8cb8935

Change-Id: I40a636fba58a0ccaeeeaab3510229dfebf0925a9