diff --git a/res/xml/device_admin.xml b/res/xml/device_admin.xml
index f733cf4c4..79455523a 100644
--- a/res/xml/device_admin.xml
+++ b/res/xml/device_admin.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 
-<device-admin xmlns:android="http://schemas.android.com/apk/res/android">
+<device-admin xmlns:android="http://schemas.android.com/apk/res/android"
+        android:visible="false">
     <uses-policies>
         <limit-password />
         <watch-login />
diff --git a/src/com/android/email/SecurityPolicy.java b/src/com/android/email/SecurityPolicy.java
index 1cbaf0a34..34ec3472e 100644
--- a/src/com/android/email/SecurityPolicy.java
+++ b/src/com/android/email/SecurityPolicy.java
@@ -22,11 +22,11 @@ import com.android.email.provider.EmailContent.Account;
 import com.android.email.provider.EmailContent.AccountColumns;
 import com.android.email.service.MailService;
 
-import android.app.DeviceAdminReceiver;
-import android.app.DevicePolicyManager;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
+import android.app.admin.DeviceAdminReceiver;
+import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.ContentUris;
diff --git a/src/com/android/email/activity/setup/AccountSecurity.java b/src/com/android/email/activity/setup/AccountSecurity.java
index 1d1311d1a..2cc3d47cd 100644
--- a/src/com/android/email/activity/setup/AccountSecurity.java
+++ b/src/com/android/email/activity/setup/AccountSecurity.java
@@ -21,7 +21,7 @@ import com.android.email.SecurityPolicy;
 import com.android.email.provider.EmailContent.Account;
 
 import android.app.Activity;
-import android.app.DevicePolicyManager;
+import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;