diff --git a/prebuilt/common/etc/init.local.rc b/prebuilt/common/etc/init.local.rc
index 4f890b8..a3fa6b1 100644
--- a/prebuilt/common/etc/init.local.rc
+++ b/prebuilt/common/etc/init.local.rc
@@ -25,7 +25,7 @@
 
     # Realtime display class
     mkdir /sys/fs/cgroup/bfqio/rt-display 0755 root system
-    write /sys/fs/cgroup/bfqio/rt-display/bfqio.ioprio_class 1 
+    write /sys/fs/cgroup/bfqio/rt-display/bfqio.ioprio_class 1
     write /sys/fs/cgroup/bfqio/rt-display/bfqio.ioprio 7
     write /sys/fs/cgroup/bfqio/rt-display/bfqio.weight 1000
     chown system graphics /sys/fs/cgroup/bfqio/rt-display/tasks
@@ -42,7 +42,7 @@
     # Hipri class
     mkdir /sys/fs/cgroup/bfqio/hipri 0755 root system
     write /sys/fs/cgroup/bfqio/hipri/bfqio.ioprio_class 2
-    write /sys/fs/cgroup/bfqio/hipri/bfqio.ioprio 2 
+    write /sys/fs/cgroup/bfqio/hipri/bfqio.ioprio 2
     write /sys/fs/cgroup/bfqio/hipri/bfqio.weight 1000
     chown root system /sys/fs/cgroup/bfqio/hipri/tasks
     chmod 0666 /sys/fs/cgroup/bfqio/hipri/tasks
@@ -164,13 +164,6 @@
 # Persistent properties (only created if persist exists)
     mkdir /persist/properties 0770 system system
 
-# Configure IO scheduler
-on property:sys.io.scheduler=*
-    write /sys/block/mmcblk0/queue/scheduler ${sys.io.scheduler}
-
-on property:persist.sys.io.scheduler=*
-    setprop sys.io.scheduler ${persist.sys.io.scheduler}
-
 # sysinit (/system/etc/init.d)
 service sysinit /system/bin/sysinit
     user root
@@ -183,3 +176,18 @@
     oneshot
     disabled
     keycodes 114 115 116
+
+# Configure IO scheduler
+on property:sys.io.scheduler=*
+    write /sys/block/mmcblk0/queue/scheduler ${sys.io.scheduler}
+
+on property:persist.sys.io.scheduler=*
+    setprop sys.io.scheduler ${persist.sys.io.scheduler}
+
+# Set slice_idle to 0 for CFQ
+on property:sys.io.scheduler=cfq
+    write /sys/block/mmcblk0/queue/iosched/slice_idle 0
+
+# Set slice_idle to 0 for BFQ
+on property:sys.io.scheduler=bfq
+    write /sys/block/mmcblk0/queue/iosched/slice_idle 0