diff --git a/vpn/java/android/net/vpn/VpnManager.java b/vpn/java/android/net/vpn/VpnManager.java
index 60fecc22e..ce40b5d0c 100644
--- a/vpn/java/android/net/vpn/VpnManager.java
+++ b/vpn/java/android/net/vpn/VpnManager.java
@@ -16,12 +16,15 @@
 
 package android.net.vpn;
 
+import java.io.File;
+
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
 import android.os.Environment;
+import android.os.SystemProperties;
 import android.util.Log;
 
 /**
@@ -83,7 +86,7 @@ public class VpnManager {
     // TODO(oam): Test VPN when EFS is enabled (will do later)...
     public static String getProfilePath() {
         // This call will return the correct path if Encrypted FS is enabled or not.
-        return Environment.getDataDirectory().getPath() + PROFILES_PATH;
+        return Environment.getSecureDataDirectory().getPath() + PROFILES_PATH;
     }
 
     /**
@@ -121,7 +124,7 @@ public class VpnManager {
      */
     public VpnProfile createVpnProfile(VpnType type, boolean customized) {
         try {
-            VpnProfile p = type.getProfileClass().newInstance();
+            VpnProfile p = (VpnProfile) type.getProfileClass().newInstance();
             p.setCustomized(customized);
             return p;
         } catch (InstantiationException e) {