diff --git a/crypto/fscrypt/FsCrypt.cpp b/crypto/fscrypt/FsCrypt.cpp
index 6284fa86..a2049a2a 100755
--- a/crypto/fscrypt/FsCrypt.cpp
+++ b/crypto/fscrypt/FsCrypt.cpp
@@ -875,13 +875,18 @@ bool fscrypt_prepare_user_storage(const std::string& volume_uuid, userid_t user_
             EncryptionPolicy de_policy;
             if (volume_uuid.empty()) {
                 if (!lookup_policy(s_de_policies, user_id, &de_policy)) return false;
-                if (!EnsurePolicy(de_policy, system_de_path)) return false;
-                if (!EnsurePolicy(de_policy, misc_de_path)) return false;
-                if (!EnsurePolicy(de_policy, vendor_de_path)) return false;
+                if (!EnsurePolicy(de_policy, system_de_path))
+                	LOG(INFO) << "EnsurePolicy returned false for " << system_de_path;
+                if (!EnsurePolicy(de_policy, misc_de_path))
+                	LOG(INFO) << "EnsurePolicy returned false for " << misc_de_path;
+                if (!EnsurePolicy(de_policy, vendor_de_path))
+                	LOG(INFO) << "EnsurePolicy returned false for " << vendor_de_path;
             } else {
                 if (!read_or_create_volkey(misc_de_path, volume_uuid, &de_policy)) return false;
             }
-            if (!EnsurePolicy(de_policy, user_de_path)) return false;
+            if (!EnsurePolicy(de_policy, user_de_path))
+            	LOG(INFO) << "EnsurePolicy returned false for " << user_de_path;
+
         }
     }
 
@@ -906,14 +911,19 @@ bool fscrypt_prepare_user_storage(const std::string& volume_uuid, userid_t user_
             EncryptionPolicy ce_policy;
             if (volume_uuid.empty()) {
                 if (!lookup_policy(s_ce_policies, user_id, &ce_policy)) return false;
-                if (!EnsurePolicy(ce_policy, system_ce_path)) return false;
-                if (!EnsurePolicy(ce_policy, misc_ce_path)) return false;
-                if (!EnsurePolicy(ce_policy, vendor_ce_path)) return false;
+                if (!EnsurePolicy(ce_policy, system_ce_path))
+                	LOG(INFO) << "EnsurePolicy returned false for " << system_ce_path;
+                if (!EnsurePolicy(ce_policy, misc_ce_path))
+                	LOG(INFO) << "EnsurePolicy returned false for " << misc_ce_path;
+                if (!EnsurePolicy(ce_policy, vendor_ce_path))
+                	LOG(INFO) << "EnsurePolicy returned false for " << vendor_ce_path;
             } else {
                 if (!read_or_create_volkey(misc_ce_path, volume_uuid, &ce_policy)) return false;
             }
-            if (!EnsurePolicy(ce_policy, media_ce_path)) return false;
-            if (!EnsurePolicy(ce_policy, user_ce_path)) return false;
+            if (!EnsurePolicy(ce_policy, media_ce_path))
+            	LOG(INFO) << "EnsurePolicy returned false for " << media_ce_path;
+            if (!EnsurePolicy(ce_policy, user_ce_path))
+            	LOG(INFO) << "EnsurePolicy returned false for " << user_ce_path;
         }
 
         if (volume_uuid.empty()) {
diff --git a/partition.cpp b/partition.cpp
index 074cf9f9..10f4868a 100755
--- a/partition.cpp
+++ b/partition.cpp
@@ -703,8 +703,6 @@ void TWPartition::Setup_Data_Partition(bool Display_Error) {
 			Primary_Block_Device.c_str(), Mount_Point.c_str());
 		}
 	} else {
-		if (Is_Mounted())
-			UnMount(true);
 		Set_FBE_Status();
 		int is_device_fbe;
 		DataManager::GetValue(TW_IS_FBE, is_device_fbe);
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 1a0beee2..5b8df086 100755
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -401,7 +401,7 @@ LOCAL_POST_INSTALL_CMD += \
         LOCAL_POST_INSTALL_CMD += \
             && cp $(TARGET_OUT_ETC)/mke2fs.conf $(TARGET_RECOVERY_ROOT_OUT)/system/etc/mke2fs.conf
     endif
-LOCAL_REQUIRED_MODULES += init_second_stage.recovery reboot.recovery plat_service_contexts plat_hardware_contexts vndservice_contexts
+LOCAL_REQUIRED_MODULES += init_second_stage.recovery reboot.recovery plat_service_contexts plat_hardware_contexts vndservice_contexts twrp_soong
 include $(BUILD_PHONY_PACKAGE)
 
 # copy license file for OpenAES
diff --git a/variables.h b/variables.h
index 8da69e94..661bb481 100755
--- a/variables.h
+++ b/variables.h
@@ -17,7 +17,7 @@
 #ifndef _VARIABLES_HEADER_
 #define _VARIABLES_HEADER_
 
-#define TW_MAIN_VERSION_STR       "3.6.0_11"
+#define TW_MAIN_VERSION_STR       "3.6.1_11"
 #define TW_VERSION_STR TW_MAIN_VERSION_STR TW_DEVICE_VERSION
 #define TW_SETTINGS_FILE            ".twrps"
 #define TW_RECOVERY_NAME            "TWRP"