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

Change-Id: I8dc2233f7a39deee7d557d65d8130248fbb32cf5