diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1d32288..d4835f3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -35,7 +35,7 @@
     <protected-broadcast android:name="android.intent.action.DATA_CONNECTION_FAILED" />
     <protected-broadcast android:name="android.intent.action.DATA_STALL_DETECTED" />
     <protected-broadcast android:name="android.intent.action.SIM_STATE_CHANGED" />
-    <protected-broadcast android:name="android.intent.action.NETWORK_SET_TIME" />
+    <protected-broadcast android:name="android.telephony.action.NETWORK_SET_TIME" />
     <protected-broadcast android:name="com.android.internal.intent.action.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS" />
     <protected-broadcast android:name="android.intent.action.ACTION_MDN_STATE_CHANGED" />
     <protected-broadcast android:name="android.provider.Telephony.SPN_STRINGS_UPDATED" />
diff --git a/src/com/android/phone/TelephonyShellCommand.java b/src/com/android/phone/TelephonyShellCommand.java
index 53b3356..db2f429 100644
--- a/src/com/android/phone/TelephonyShellCommand.java
+++ b/src/com/android/phone/TelephonyShellCommand.java
@@ -57,9 +57,6 @@
     private static final String NUMBER_VERIFICATION_SUBCOMMAND = "numverify";
     private static final String EMERGENCY_NUMBER_TEST_MODE = "emergency-number-test-mode";
     private static final String CARRIER_CONFIG_SUBCOMMAND = "cc";
-    private static final String DATA_TEST_MODE = "data";
-    private static final String DATA_ENABLE = "enable";
-    private static final String DATA_DISABLE = "disable";
 
     private static final String IMS_SET_CARRIER_SERVICE = "set-ims-service";
     private static final String IMS_GET_CARRIER_SERVICE = "get-ims-service";
@@ -151,8 +148,6 @@
             case CARRIER_CONFIG_SUBCOMMAND: {
                 return handleCcCommand();
             }
-            case DATA_TEST_MODE:
-                return handleDataTestModeCommand();
             default: {
                 return handleDefaultCommands(cmd);
             }
@@ -169,13 +164,10 @@
         pw.println("    IMS Commands.");
         pw.println("  emergency-number-test-mode");
         pw.println("    Emergency Number Test Mode Commands.");
-        pw.println("  data");
-        pw.println("    Data Test Mode Commands.");
         pw.println("  cc");
         pw.println("    Carrier Config Commands.");
         onHelpIms();
         onHelpEmergencyNumber();
-        onHelpDataTestMode();
         onHelpCc();
     }
 
@@ -221,13 +213,6 @@
         pw.println("    1 if the call would have been intercepted, 0 otherwise.");
     }
 
-    private void onHelpDataTestMode() {
-        PrintWriter pw = getOutPrintWriter();
-        pw.println("Mobile Data Test Mode Commands:");
-        pw.println("  data enable: enable mobile data connectivity");
-        pw.println("  data disable: disable mobile data connectivity");
-    }
-
     private void onHelpEmergencyNumber() {
         PrintWriter pw = getOutPrintWriter();
         pw.println("Emergency Number Test Mode Commands:");
@@ -298,41 +283,6 @@
         return -1;
     }
 
-    private int handleDataTestModeCommand() {
-        PrintWriter errPw = getErrPrintWriter();
-        String arg = getNextArgRequired();
-        if (arg == null) {
-            onHelpDataTestMode();
-            return 0;
-        }
-        switch (arg) {
-            case DATA_ENABLE: {
-                try {
-                    mInterface.enableDataConnectivity();
-                } catch (RemoteException ex) {
-                    Log.w(LOG_TAG, "data enable, error " + ex.getMessage());
-                    errPw.println("Exception: " + ex.getMessage());
-                    return -1;
-                }
-                break;
-            }
-            case DATA_DISABLE: {
-                try {
-                    mInterface.disableDataConnectivity();
-                } catch (RemoteException ex) {
-                    Log.w(LOG_TAG, "data disable, error " + ex.getMessage());
-                    errPw.println("Exception: " + ex.getMessage());
-                    return -1;
-                }
-                break;
-            }
-            default:
-                onHelpDataTestMode();
-                break;
-        }
-        return 0;
-    }
-
     private int handleEmergencyNumberTestModeCommand() {
         PrintWriter errPw = getErrPrintWriter();
         String opt = getNextOption();
diff --git a/src/com/android/phone/settings/fdn/EditFdnContactScreen.java b/src/com/android/phone/settings/fdn/EditFdnContactScreen.java
index 0eda140..140cc74 100644
--- a/src/com/android/phone/settings/fdn/EditFdnContactScreen.java
+++ b/src/com/android/phone/settings/fdn/EditFdnContactScreen.java
@@ -443,7 +443,7 @@
             }
 
             if (v == mNameField) {
-                mNumberField.requestFocus();
+                mButton.requestFocus();
             } else if (v == mNumberField) {
                 mButton.requestFocus();
             } else if (v == mButton) {