diff --git a/rootdir/etc/init.qcom.factory.sh b/rootdir/etc/init.qcom.factory.sh
index e127a666..b511c8d5 100644
--- a/rootdir/etc/init.qcom.factory.sh
+++ b/rootdir/etc/init.qcom.factory.sh
@@ -234,10 +234,10 @@
     setprop system_init.startsurfaceflinger 0
 
 # Start the following services needed for fftm
+    start logd
     start config_bluetooth
     start media
     start fastmmi
-    start adbd
     start qcom-post-boot
     start rmt_storage
     start qcom-c_main-sh
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index be0f8290..f642da25 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -797,12 +797,22 @@ service fastmmisrv /system/bin/sh /init.qcom.factory.sh
     disabled
     oneshot
 
+on mmi
+    start fastmmisrv
+
 on ffbm
     trigger early-fs
     trigger fs
     trigger post-fs
     trigger post-fs-data
-    start fastmmisrv
+
+    # Load properties from /system/ + /factory after fs mount. Place
+    # this in another action so that the load will be scheduled after the prior
+    # issued fs triggers have completed.
+    trigger load_all_props_action
+
+    trigger early-boot
+    trigger mmi
 
 service hvdcp /system/bin/hvdcp
     class core