diff --git a/api/current.xml b/api/current.xml
index a5c4e6871eb74..1ca4e1a62d91b 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -17269,6 +17269,39 @@
  visibility="public"
 >
 </field>
+<field name="AUTHENTICATOR_ATTRIBUTES_NAME"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;account-authenticator&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="AUTHENTICATOR_INTENT_ACTION"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;android.accounts.AccountAuthenticator&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="AUTHENTICATOR_META_DATA_NAME"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;android.accounts.AccountAuthenticator&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="AUTHENTICATOR_TYPES_KEY"
  type="java.lang.String"
  transient="false"
diff --git a/core/java/android/accounts/AccountAuthenticatorCache.java b/core/java/android/accounts/AccountAuthenticatorCache.java
index c8fc12c1fd1cd..2f52f409b8f9d 100644
--- a/core/java/android/accounts/AccountAuthenticatorCache.java
+++ b/core/java/android/accounts/AccountAuthenticatorCache.java
@@ -33,12 +33,9 @@ import android.util.AttributeSet;
         extends RegisteredServicesCache<AuthenticatorDescription> {
     private static final String TAG = "Account";
 
-    private static final String SERVICE_INTERFACE = "android.accounts.AccountAuthenticator";
-    private static final String SERVICE_META_DATA = "android.accounts.AccountAuthenticator";
-    private static final String ATTRIBUTES_NAME = "account-authenticator";
-
     public AccountAuthenticatorCache(Context context) {
-        super(context, SERVICE_INTERFACE, SERVICE_META_DATA, ATTRIBUTES_NAME);
+        super(context, Constants.AUTHENTICATOR_INTENT_ACTION,
+                Constants.AUTHENTICATOR_META_DATA_NAME, Constants.AUTHENTICATOR_ATTRIBUTES_NAME);
     }
 
     public AuthenticatorDescription parseServiceAttributes(String packageName, AttributeSet attrs) {
diff --git a/core/java/android/accounts/Constants.java b/core/java/android/accounts/Constants.java
index 4c1fa02d0219c..bb7f9401e80a5 100644
--- a/core/java/android/accounts/Constants.java
+++ b/core/java/android/accounts/Constants.java
@@ -40,6 +40,13 @@ public class Constants {
     public static final String ACCOUNT_AUTHENTICATOR_RESPONSE_KEY = "accountAuthenticatorResponse";
     public static final String ACCOUNT_MANAGER_RESPONSE_KEY = "accountManagerResponse";
     public static final String AUTH_FAILED_MESSAGE_KEY = "authFailedMessage";
+
+    public static final String AUTHENTICATOR_INTENT_ACTION =
+            "android.accounts.AccountAuthenticator";
+    public static final String AUTHENTICATOR_META_DATA_NAME =
+            "android.accounts.AccountAuthenticator";
+    public static final String AUTHENTICATOR_ATTRIBUTES_NAME = "account-authenticator";
+
     /**
      * Action sent as a broadcast Intent by the AccountsService
      * when accounts are added to and/or removed from the device's
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index 04a5a0ffdb7df..718a120ded944 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -1011,6 +1011,16 @@ public final class ContactsContract {
          */
         public static final String SOURCE_ID = "sourceid";
 
+        /**
+         * An integer that is updated whenever this contact or its data changes.
+         */
+        public static final String VERSION = "version";
+
+        /**
+         * Set to 1 whenever the version changes
+         */
+        public static final String DIRTY = "dirty";
+
         /**
          * Flag indicating if the contacts belonging to this group should be
          * visible in any user interface.