jannikmueller@fedora:~/hadk/system/core/init$ git diff
diff --git a/init/Android.bp b/init/Android.bp
index 7d4bf738c..1d16e213b 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -499,6 +499,16 @@ cc_binary {
     defaults: ["init_first_stage_defaults"],
 }
 
+cc_binary {
+    name: "init_load_kernel_modules",
+    defaults: ["init_first_stage_defaults"],
+    cflags: [
+       "-DHYBRIS_EXIT_AFTER_LOAD_KERNEL_MODULES=1",
+    ],
+    stem: "load_kernel_modules"
+}
+
+
 cc_binary {
     name: "init_first_stage.microdroid",
     defaults: [
diff --git a/init/first_stage_init.cpp b/init/first_stage_init.cpp
index ce6e0d570..614e3e5f3 100644
--- a/init/first_stage_init.cpp
+++ b/init/first_stage_init.cpp
@@ -463,6 +463,10 @@ int FirstStageMain(int argc, char** argv) {
                   << module_elapse_time.count() << " ms";
     }
 
+#ifdef HYBRIS_EXIT_AFTER_LOAD_KERNEL_MODULES
+    return 0;
+#endif
+
     MaybeResumeFromHibernation(bootconfig);
 
     std::unique_ptr<FirstStageMount> fsm;