diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index 6c658b29b3466..0e72aafba10e3 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -1137,6 +1137,11 @@ public final class ContactsContract {
             /** MIME type used when storing this in data table. */
             public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/email_v2";
 
+            /**
+             * The MIME type of {@link #CONTENT_URI} providing a directory of email addresses.
+             */
+            public static final String CONTENT_TYPE = "vnd.android.cursor.dir/email_v2";
+
             /**
              * The content:// style URI for all data records of the
              * {@link Email#CONTENT_ITEM_TYPE} MIME type, combined with the
@@ -1153,9 +1158,6 @@ public final class ContactsContract {
             public static final Uri CONTENT_LOOKUP_URI = Uri.withAppendedPath(CONTENT_URI,
                     "lookup");
 
-            @Deprecated
-            public static final Uri CONTENT_FILTER_EMAIL_URI = CONTENT_LOOKUP_URI;
-
             /**
              * The content:// style URL for email lookup using a filter. The filter returns
              * records of MIME type {@link Email#CONTENT_ITEM_TYPE}. The filter is applied
@@ -1680,24 +1682,12 @@ public final class ContactsContract {
          */
         public static final int TYPE_KEEP_TOGETHER = 1;
 
-        @Deprecated
-        public static final int TYPE_KEEP_IN = 1;
-
         /**
          * Makes sure that the specified raw contacts are NOT included in the same
          * aggregate contact.
          */
         public static final int TYPE_KEEP_SEPARATE = 2;
 
-        @Deprecated
-        public static final int TYPE_KEEP_OUT = 2;
-
-        @Deprecated
-        public static final String CONTACT_ID = "contact_id";
-
-        @Deprecated
-        public static final String RAW_CONTACT_ID = "raw_contact_id";
-
         /**
          * A reference to the {@link RawContacts#_ID} of the raw contact that the rule applies to.
          */