diff --git a/api/current.xml b/api/current.xml
index e64726a4d15c5..b348555987dff 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -42572,6 +42572,25 @@
 >
 </field>
 </class>
+<interface name="RegisteredServicesCacheListener"
+ abstract="true"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="onRegisteredServicesCacheChanged"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+</interface>
 <class name="ResolveInfo"
  extends="java.lang.Object"
  abstract="false"
diff --git a/core/java/android/accounts/AccountManagerService.java b/core/java/android/accounts/AccountManagerService.java
index 4217957e63e7b..9c8006ee0d9f1 100644
--- a/core/java/android/accounts/AccountManagerService.java
+++ b/core/java/android/accounts/AccountManagerService.java
@@ -25,6 +25,7 @@ import android.content.pm.PackageManager;
 import android.content.pm.RegisteredServicesCache;
 import android.content.pm.PackageInfo;
 import android.content.pm.ApplicationInfo;
+import android.content.pm.RegisteredServicesCacheListener;
 import android.database.Cursor;
 import android.database.DatabaseUtils;
 import android.database.sqlite.SQLiteDatabase;
@@ -69,7 +70,9 @@ import com.android.internal.R;
  *      (AccountManager)context.getSystemService(Context.ACCOUNT_SERVICE)
  * @hide
  */
-public class AccountManagerService extends IAccountManager.Stub {
+public class AccountManagerService
+        extends IAccountManager.Stub
+        implements RegisteredServicesCacheListener {
     private static final String TAG = "AccountManagerService";
 
     private static final int TIMEOUT_DELAY_MS = 1000 * 60;
@@ -209,11 +212,41 @@ public class AccountManagerService extends IAccountManager.Stub {
         mMessageHandler = new MessageHandler(mMessageThread.getLooper());
 
         mAuthenticatorCache = new AccountAuthenticatorCache(mContext);
+        mAuthenticatorCache.setListener(this);
         mBindHelper = new AuthenticatorBindHelper(mContext, mAuthenticatorCache, mMessageHandler,
                 MESSAGE_CONNECTED, MESSAGE_DISCONNECTED);
 
         mSimWatcher = new SimWatcher(mContext);
         sThis.set(this);
+
+        onRegisteredServicesCacheChanged();
+    }
+
+    public void onRegisteredServicesCacheChanged() {
+        boolean accountDeleted = false;
+        SQLiteDatabase db = mOpenHelper.getWritableDatabase();
+        Cursor cursor = db.query(TABLE_ACCOUNTS,
+                new String[]{ACCOUNTS_ID, ACCOUNTS_TYPE, ACCOUNTS_NAME},
+                null, null, null, null, null);
+        try {
+            while (cursor.moveToNext()) {
+                final long accountId = cursor.getLong(0);
+                final String accountType = cursor.getString(1);
+                final String accountName = cursor.getString(2);
+                if (mAuthenticatorCache.getServiceInfo(AuthenticatorDescription.newKey(accountType))
+                        == null) {
+                    Log.d(TAG, "deleting account " + accountName + " because type "
+                            + accountType + " no longer has a registered authenticator");
+                    db.delete(TABLE_ACCOUNTS, ACCOUNTS_ID + "=" + accountId, null);
+                    accountDeleted= true;
+                }
+            }
+        } finally {
+            cursor.close();
+            if (accountDeleted) {
+                sendAccountsChangedBroadcast();
+            }
+        }
     }
 
     public String getPassword(Account account) {
@@ -533,17 +566,21 @@ public class AccountManagerService extends IAccountManager.Stub {
         checkAuthenticateAccountsPermission(account);
         long identityToken = clearCallingIdentity();
         try {
-            ContentValues values = new ContentValues();
-            values.put(ACCOUNTS_PASSWORD, password);
-            mOpenHelper.getWritableDatabase().update(TABLE_ACCOUNTS, values,
-                    ACCOUNTS_NAME + "=? AND " + ACCOUNTS_TYPE+ "=?",
-                    new String[]{account.name, account.type});
-            sendAccountsChangedBroadcast();
+            setPasswordInDB(account, password);
         } finally {
             restoreCallingIdentity(identityToken);
         }
     }
 
+    private void setPasswordInDB(Account account, String password) {
+        ContentValues values = new ContentValues();
+        values.put(ACCOUNTS_PASSWORD, password);
+        mOpenHelper.getWritableDatabase().update(TABLE_ACCOUNTS, values,
+                ACCOUNTS_NAME + "=? AND " + ACCOUNTS_TYPE+ "=?",
+                new String[]{account.name, account.type});
+        sendAccountsChangedBroadcast();
+    }
+
     private void sendAccountsChangedBroadcast() {
         mContext.sendBroadcast(ACCOUNTS_CHANGED_INTENT);
     }
@@ -552,7 +589,7 @@ public class AccountManagerService extends IAccountManager.Stub {
         checkManageAccountsPermission();
         long identityToken = clearCallingIdentity();
         try {
-            setPassword(account, null);
+            setPasswordInDB(account, null);
         } finally {
             restoreCallingIdentity(identityToken);
         }
diff --git a/core/java/android/content/pm/RegisteredServicesCache.java b/core/java/android/content/pm/RegisteredServicesCache.java
index f5f8f3088522a..538373f322787 100644
--- a/core/java/android/content/pm/RegisteredServicesCache.java
+++ b/core/java/android/content/pm/RegisteredServicesCache.java
@@ -53,6 +53,16 @@ public abstract class RegisteredServicesCache<V> {
     private final String mMetaDataName;
     private final String mAttributesName;
 
+    public RegisteredServicesCacheListener getListener() {
+        return mListener;
+    }
+
+    public void setListener(RegisteredServicesCacheListener listener) {
+        mListener = listener;
+    }
+
+    private volatile RegisteredServicesCacheListener mListener;
+
     // no need to be synchronized since the map is never changed once mService is written
     volatile Map<V, ServiceInfo<V>> mServices;
 
@@ -84,6 +94,10 @@ public abstract class RegisteredServicesCache<V> {
                         @Override
                         public void onReceive(Context context, Intent intent) {
                             mServices = generateServicesMap();
+                            RegisteredServicesCacheListener listener = mListener;
+                            if (listener != null) {
+                                listener.onRegisteredServicesCacheChanged();
+                            }
                         }
                     };
                 }
diff --git a/core/java/android/content/pm/RegisteredServicesCacheListener.java b/core/java/android/content/pm/RegisteredServicesCacheListener.java
new file mode 100644
index 0000000000000..8cf15e4287884
--- /dev/null
+++ b/core/java/android/content/pm/RegisteredServicesCacheListener.java
@@ -0,0 +1,11 @@
+package android.content.pm;
+
+/**
+ * Listener for changes to the set of registered services managed by a RegisteredServicesCache.
+ */
+public interface RegisteredServicesCacheListener {
+    /**
+     * Invoked when the registered services cache changes.
+     */
+    void onRegisteredServicesCacheChanged();
+}