diff --git a/src/com/android/settings/accessibility/RTTSettingPreferenceController.java b/src/com/android/settings/accessibility/RTTSettingPreferenceController.java
index 3ad2a3b..8ab8850 100644
--- a/src/com/android/settings/accessibility/RTTSettingPreferenceController.java
+++ b/src/com/android/settings/accessibility/RTTSettingPreferenceController.java
@@ -61,7 +61,8 @@
         mDialerPackage = mContext.getString(R.string.config_rtt_setting_package_name);
         mPackageManager = mContext.getPackageManager();
         mCarrierConfigManager = mContext.getSystemService(CarrierConfigManager.class);
-        mRTTIntent = new Intent(context.getString(R.string.config_rtt_setting_intent_action));
+        mRTTIntent = new Intent(context.getString(R.string.config_rtt_setting_intent_action))
+                .setPackage(mDialerPackage);
         Log.d(TAG, "init controller");
     }
 
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index 72e1ad8..0e50a5c 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -443,7 +443,8 @@
         final ApplicationInfo appInfo =
                 a11yServiceInfo.getResolveInfo().serviceInfo.applicationInfo;
         final Uri packageUri = Uri.parse("package:" + appInfo.packageName);
-        final Intent uninstallIntent = new Intent(Intent.ACTION_UNINSTALL_PACKAGE, packageUri);
+        final Intent uninstallIntent = new Intent(Intent.ACTION_UNINSTALL_PACKAGE, packageUri)
+                .setPackage(getString(R.string.config_package_installer_package_name));
         return uninstallIntent;
     }
 
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index b76e9a7..137be21 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -570,6 +570,7 @@
         }
 
         Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+        intent.setPackage(getContext().getPackageName());
         intent.setData(Uri.parse("package:" + packageName));
 
         final Preference appInfoPreference = new Preference(getPrefContext());
