diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index f2438d9..26ae699 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -19,6 +19,7 @@
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -70,9 +71,7 @@
  * is from the package com.android.contacts.
  *
  * For the "Mobile network settings" screen under the main Settings app,
- * See {@link MobileNetworkSettings}.
- *
- * @see com.android.phone.MobileNetworkSettings
+ * See {@link com.android.settings.network.telephony.MobileNetworkActivity}.
  */
 public class CallFeaturesSetting extends PreferenceActivity
         implements Preference.OnPreferenceChangeListener {
@@ -174,8 +173,12 @@
                         new Dialog.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
-                                startActivity(new Intent(mPhone.getContext(),
-                                        com.android.phone.MobileNetworkSettings.class));
+                                Intent intent = new Intent(Intent.ACTION_MAIN);
+                                ComponentName mobileNetworkSettingsComponent = new ComponentName(
+                                        getString(R.string.mobile_network_settings_package),
+                                        getString(R.string.mobile_network_settings_class));
+                                intent.setComponent(mobileNetworkSettingsComponent);
+                                startActivity(intent);
                             }
                         };
                 builder.setMessage(getResources().getString(
diff --git a/src/com/android/phone/settings/SuppServicesUiUtil.java b/src/com/android/phone/settings/SuppServicesUiUtil.java
index 8cb37a5..d508d9c 100644
--- a/src/com/android/phone/settings/SuppServicesUiUtil.java
+++ b/src/com/android/phone/settings/SuppServicesUiUtil.java
@@ -18,6 +18,7 @@
 
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -66,8 +67,12 @@
                 new Dialog.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        context.startActivity(new Intent(context,
-                                com.android.phone.MobileNetworkSettings.class));
+                        Intent intent = new Intent(Intent.ACTION_MAIN);
+                        ComponentName mobileNetworkSettingsComponent = new ComponentName(
+                                context.getString(R.string.mobile_network_settings_package),
+                                context.getString(R.string.mobile_network_settings_class));
+                        intent.setComponent(mobileNetworkSettingsComponent);
+                        context.startActivity(intent);
                     }
                 };
         return builder.setMessage(message)
