diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f001cc4..7c701b5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -152,8 +152,8 @@
             android:allowBackup="false"
             android:supportsRtl="true"
             android:usesCleartextTraffic="true"
-            android:forceDeviceEncrypted="true"
-            android:encryptionAware="true">
+            android:defaultToDeviceProtectedStorage="true"
+            android:directBootAware="true">
 
         <provider android:name="IccProvider"
                 android:authorities="icc"
diff --git a/sip/src/com/android/services/telephony/sip/SipProfileDb.java b/sip/src/com/android/services/telephony/sip/SipProfileDb.java
index fed8438..e7b201b 100644
--- a/sip/src/com/android/services/telephony/sip/SipProfileDb.java
+++ b/sip/src/com/android/services/telephony/sip/SipProfileDb.java
@@ -51,13 +51,13 @@
 
     public SipProfileDb(Context context) {
         // Sip Profile Db should always reference CE storage.
-        mContext = context.createCredentialEncryptedStorageContext();
+        mContext = context.createCredentialProtectedStorageContext();
         setupDatabase();
     }
 
     // Only should be used during migration from M->N to move database
     public void accessDEStorageForMigration() {
-        mContext = mContext.createDeviceEncryptedStorageContext();
+        mContext = mContext.createDeviceProtectedStorageContext();
         setupDatabase();
     }
 
diff --git a/src/com/android/phone/vvm/omtp/OmtpBootCompletedReceiver.java b/src/com/android/phone/vvm/omtp/OmtpBootCompletedReceiver.java
index a751e19..a2b85f7 100644
--- a/src/com/android/phone/vvm/omtp/OmtpBootCompletedReceiver.java
+++ b/src/com/android/phone/vvm/omtp/OmtpBootCompletedReceiver.java
@@ -106,6 +106,6 @@
 
     private static SharedPreferences getSubIdSharedPreference(Context context) {
         return PreferenceManager
-                .getDefaultSharedPreferences(context.createDeviceEncryptedStorageContext());
+                .getDefaultSharedPreferences(context.createDeviceProtectedStorageContext());
     }
 }
diff --git a/tests/src/com/android/phone/vvm/omtp/OmtpBootCompletedReceiverTests.java b/tests/src/com/android/phone/vvm/omtp/OmtpBootCompletedReceiverTests.java
index a2d247a..1924d9f 100644
--- a/tests/src/com/android/phone/vvm/omtp/OmtpBootCompletedReceiverTests.java
+++ b/tests/src/com/android/phone/vvm/omtp/OmtpBootCompletedReceiverTests.java
@@ -35,7 +35,7 @@
     @Override
     public void tearDown() {
         PreferenceManager
-                .getDefaultSharedPreferences(getContext().createDeviceEncryptedStorageContext())
+                .getDefaultSharedPreferences(getContext().createDeviceProtectedStorageContext())
                 .edit().clear().apply();
     }