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

Change-Id: Ibcf82a36955a2bbb0d9577628b1f70e2ebd69304