diff --git a/api/current.txt b/api/current.txt
index 531b9af9d251a..d380e70d6a019 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -31558,7 +31558,7 @@ package android.provider {
 
   public static final class ContactsContract.Directory implements android.provider.BaseColumns {
     method public static boolean isEnterpriseDirectoryId(long);
-    method public static boolean isRemoteDirectory(long);
+    method public static boolean isRemoteDirectoryId(long);
     method public static void notifyDirectoryChange(android.content.ContentResolver);
     field public static final java.lang.String ACCOUNT_NAME = "accountName";
     field public static final java.lang.String ACCOUNT_TYPE = "accountType";
diff --git a/api/system-current.txt b/api/system-current.txt
index 9023505795371..dbbefbf934cb4 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -34125,7 +34125,7 @@ package android.provider {
 
   public static final class ContactsContract.Directory implements android.provider.BaseColumns {
     method public static boolean isEnterpriseDirectoryId(long);
-    method public static boolean isRemoteDirectory(long);
+    method public static boolean isRemoteDirectoryId(long);
     method public static void notifyDirectoryChange(android.content.ContentResolver);
     field public static final java.lang.String ACCOUNT_NAME = "accountName";
     field public static final java.lang.String ACCOUNT_TYPE = "accountType";
diff --git a/api/test-current.txt b/api/test-current.txt
index 3a51e758308f4..acd729913df0d 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -31631,7 +31631,7 @@ package android.provider {
 
   public static final class ContactsContract.Directory implements android.provider.BaseColumns {
     method public static boolean isEnterpriseDirectoryId(long);
-    method public static boolean isRemoteDirectory(long);
+    method public static boolean isRemoteDirectoryId(long);
     method public static void notifyDirectoryChange(android.content.ContentResolver);
     field public static final java.lang.String ACCOUNT_NAME = "accountName";
     field public static final java.lang.String ACCOUNT_TYPE = "accountType";
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index 8658d137c7bba..c70304e140cff 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -607,13 +607,23 @@ public final class ContactsContract {
         /**
          * Return TRUE if it is a remote stored directory.
          */
-        public static boolean isRemoteDirectory(long directoryId) {
+        public static boolean isRemoteDirectoryId(long directoryId) {
             return directoryId != Directory.DEFAULT
                     && directoryId != Directory.LOCAL_INVISIBLE
                     && directoryId != Directory.ENTERPRISE_DEFAULT
                     && directoryId != Directory.ENTERPRISE_LOCAL_INVISIBLE;
         }
 
+        /**
+         * Return TRUE if it is a remote stored directory. TODO: Remove this method once all
+         * internal apps are not using this API.
+         *
+         * @hide
+         */
+        public static boolean isRemoteDirectory(long directoryId) {
+            return isRemoteDirectoryId(directoryId);
+        }
+
         /**
          * Return TRUE if a directory ID is from the contacts provider on the enterprise profile.
          *
@@ -1659,7 +1669,7 @@ public final class ContactsContract {
         /**
          * It supports the similar semantics as {@link #CONTENT_FILTER_URI} and returns the same
          * columns. This URI requires {@link ContactsContract#DIRECTORY_PARAM_KEY} in parameters,
-         * otherwise it will throw UnsupportedOperationException.
+         * otherwise it will throw IllegalArgumentException.
          */
         public static final Uri ENTERPRISE_CONTENT_FILTER_URI = Uri.withAppendedPath(
                 CONTENT_URI, "filter_enterprise");
@@ -5962,7 +5972,7 @@ public final class ContactsContract {
             /**
              * It supports the similar semantics as {@link #CONTENT_FILTER_URI} and returns the same
              * columns. This URI requires {@link ContactsContract#DIRECTORY_PARAM_KEY} in
-             * parameters, otherwise it will throw UnsupportedOperationException.
+             * parameters, otherwise it will throw IllegalArgumentException.
              */
             public static final Uri ENTERPRISE_CONTENT_FILTER_URI = Uri.withAppendedPath(
                     CONTENT_URI, "filter_enterprise");
@@ -6242,7 +6252,7 @@ public final class ContactsContract {
             /**
              * It supports the similar semantics as {@link #CONTENT_FILTER_URI} and returns the same
              * columns. This URI requires {@link ContactsContract#DIRECTORY_PARAM_KEY} in
-             * parameters, otherwise it will throw UnsupportedOperationException.
+             * parameters, otherwise it will throw IllegalArgumentException.
              */
             public static final Uri ENTERPRISE_CONTENT_FILTER_URI = Uri.withAppendedPath(
                     CONTENT_URI, "filter_enterprise");
@@ -7464,7 +7474,7 @@ public final class ContactsContract {
             /**
              * Similar to {@link Phone#ENTERPRISE_CONTENT_FILTER_URI}, but allows users to filter
              * callable data. This URI requires {@link ContactsContract#DIRECTORY_PARAM_KEY} in
-             * parameters, otherwise it will throw UnsupportedOperationException.
+             * parameters, otherwise it will throw IllegalArgumentException.
              */
             public static final Uri ENTERPRISE_CONTENT_FILTER_URI = Uri.withAppendedPath(
                     CONTENT_URI, "filter_enterprise");