diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index ea4d29be7..9bb16c7ff 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -39,8 +39,8 @@
             android:icon="@drawable/ic_launcher_keyboard"
             android:supportsRtl="true"
             android:allowBackup="true"
-            android:forceDeviceEncrypted="true"
-            android:encryptionAware="true">
+            android:defaultToDeviceProtectedStorage="true"
+            android:directBootAware="true">
 
         <!-- Services -->
         <service android:name="LatinIME"