diff --git a/microdroid/init.rc b/microdroid/init.rc
index 861b032..4410b82 100644
--- a/microdroid/init.rc
+++ b/microdroid/init.rc
@@ -90,15 +90,6 @@
     # Load persist properties and override properties (if enabled) from /data.
     trigger load_persist_props_action
 
-    # Should be before netd, but after apex, properties and logging is available.
-    trigger load_bpf_programs
-
-    # Now we can start zygote for devices with file based encryption
-    trigger zygote-start
-
-    # Remove a file to wake up anything waiting for firmware.
-    trigger firmware_mounts_complete
-
     trigger early-boot
     trigger boot
 
diff --git a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
index 268ee84..5449af0 100644
--- a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
+++ b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
@@ -263,9 +263,7 @@
     }
 
     private void waitForMicrodroidBoot(long timeoutMinutes) throws Exception {
-        // Wait for a specific log from logd
-        // TODO(jiyong): use a more reasonable marker
-        final String pattern = "logd.auditd: start";
+        final String pattern = "load_persist_props_action";
         getDevice()
                 .executeShellV2Command(
                         "logcat --regex=\"" + pattern + "\" -m 1",