diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bc9307993505736cf905822c6ac6154ae9cc7813..e3d9918cda5e52399bc4e87824b754ecf58bb32b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -147,6 +147,22 @@
             </intent-filter>
         </activity>
 
+
+        <!--System Updater-->
+        <activity android:name="Settings$SystemUpdaterActivity"
+            android:label="@string/system_update_settings_list_item_title"
+            android:icon="@drawable/ic_system_update">
+            <intent-filter android:priority="100">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                android:value="com.android.settings.category.ia.homepage" />
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.SystemUpdaterSettings" />
+        </activity>
+
+
+
         <!-- Wireless Controls -->
         <activity android:name=".Settings$NetworkDashboardActivity"
             android:taskAffinity="com.android.settings"
diff --git a/res/xml/system_dashboard_fragment.xml b/res/xml/system_dashboard_fragment.xml
index ced7482e35fb0f8db093e8d4303dddc05ba2657c..b362554814586b236e0fa08dbd9ac0016985ebe3 100644
--- a/res/xml/system_dashboard_fragment.xml
+++ b/res/xml/system_dashboard_fragment.xml
@@ -25,28 +25,6 @@
         android:order="-250"
         android:fragment="com.android.settings.gestures.GestureSettings" />
 
-    <!-- Backup -->
-    <!--
-    <Preference
-        android:key="backup_settings"
-        android:title="@string/privacy_settings_title"
-        android:summary="@string/summary_placeholder"
-        android:icon="@drawable/ic_settings_backup"
-        android:order="-60">
-        <intent android:action="android.settings.BACKUP_AND_RESET_SETTINGS" />
-    </Preference>
-    -->
-
-    <!-- System updates -->
-    <Preference
-        android:key="system_update_settings"
-        android:title="@string/system_update_settings_list_item_title"
-        android:summary="@string/summary_placeholder"
-        android:icon="@drawable/ic_system_update"
-        android:order="-30">
-        <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS" />
-    </Preference>
-
     <Preference
         android:key="additional_system_update_settings"
         android:title="@string/additional_system_update_settings_list_item_title"
diff --git a/res/xml/system_updater_prefs.xml b/res/xml/system_updater_prefs.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f84fb21f8fe41fba756876a838038c354d8c4b85
--- /dev/null
+++ b/res/xml/system_updater_prefs.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto">
+
+    <Preference
+        android:icon="@drawable/ic_system_update"
+        android:key="system_update_settings"
+        android:order="-30"
+        android:summary="@string/summary_placeholder"
+        android:title="@string/system_update_settings_list_item_title"
+        settings:controller="com.android.settings.system.SystemUpdatePreferenceController"
+        settings:keywords="@string/keywords_system_update_settings">
+        <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS" />
+    </Preference>
+
+</PreferenceScreen>
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 8f32d3dc6b98391d755067467c9dec451fc61b78..ba7f2f288ae8d0182a0de82a5fb8fd6bcc656eca 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -192,5 +192,6 @@ public class Settings extends SettingsActivity {
     public static class StorageDashboardActivity extends SettingsActivity {}
     public static class UserAndAccountDashboardActivity extends SettingsActivity {}
     public static class SystemDashboardActivity extends SettingsActivity {}
+    public static class SystemUpdaterActivity extends SettingsActivity { /* empty */ }
 
 }
diff --git a/src/com/android/settings/SystemUpdaterSettings.java b/src/com/android/settings/SystemUpdaterSettings.java
new file mode 100644
index 0000000000000000000000000000000000000000..9b524a9b5d0d708ca95874689bc217f188cc7dc4
--- /dev/null
+++ b/src/com/android/settings/SystemUpdaterSettings.java
@@ -0,0 +1,52 @@
+package com.android.settings;
+
+import android.os.Bundle;
+import android.content.Intent;
+import android.content.ComponentName;
+import android.app.Fragment;
+
+import android.app.Activity;
+import android.content.Context;
+import android.provider.SearchIndexableResource;
+import com.android.settings.R;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class SystemUpdaterSettings extends Fragment {
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Intent intent = new Intent("android.settings.SYSTEM_UPDATE_SETTINGS");
+        startActivity(intent);
+
+        Activity activity = getActivity();
+
+        if (activity != null) {
+            activity.finish();
+        }
+
+    }
+
+
+    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+                                                                            boolean enabled) {
+                    final ArrayList<SearchIndexableResource> result = new ArrayList<>();
+
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = R.xml.system_updater_prefs;
+                    result.add(sir);
+                    return result;
+                }
+            };
+
+
+}
+
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 31ac7252f3cea37f5e6005ee08ed5a5e0b22fd43..15849223dcc0f0a4a789dbd82d0e655c12276967 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -30,6 +30,7 @@ import com.android.settings.SecuritySettings;
 import com.android.settings.MicroGSettings;
 import com.android.settings.OpenKeychainSettings;
 import com.android.settings.Settings;
+import com.android.settings.SystemUpdaterSettings;
 import com.android.settings.TestingSettings;
 import com.android.settings.TetherSettings;
 import com.android.settings.TrustedCredentialsSettings;
@@ -256,7 +257,8 @@ public class SettingsGateway {
             BluetoothDeviceDetailsFragment.class.getName(),
             DataUsageList.class.getName(),
             MicroGSettings.class.getName(),
-            OpenKeychainSettings.class.getName()
+            OpenKeychainSettings.class.getName(),
+            SystemUpdaterSettings.class.getName()
 
     };