diff --git a/init.hardware.rc b/init.hardware.rc
index b276175d..6dd57f22 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -206,6 +206,9 @@ on post-fs-data
     # Set indication (checked by vold) that we have finished this action
     setprop vold.post_fs_data_done 1
 
+    # b/38048356 Setup debug folders for camera
+    mkdir /data/vendor/camera 0770 camera camera
+
 # zygote need to be started after otapreopt which will be done on post-fs-data
 on zygote-start
     # zygote is started in common init.rc
@@ -222,9 +225,6 @@ on zygote-start
     # Create directory for TZ Apps
     mkdir /data/misc/qsee 0770 system system
 
-    #Create folder for mm-qcamera-daemon
-    mkdir /data/misc/camera 0770 camera camera
-
     mkdir /data/media 0770 media_rw media_rw
     chown media_rw media_rw /data/media