diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d802fcb746048e665e856bb31081f7e23805780b..05cf1c860fd8dfda8b7e2ef35d1591abcac06c09 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -176,6 +176,21 @@
                 android:value="com.android.settings.shortcut.CreateShortcut" />
         </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"
diff --git a/res/xml/system_dashboard_fragment.xml b/res/xml/system_dashboard_fragment.xml
index 6a753f2a009821453489c6bd0de0763cde24a03e..63f003554cb3ca53aa2109540451b02e73d925f3 100644
--- a/res/xml/system_dashboard_fragment.xml
+++ b/res/xml/system_dashboard_fragment.xml
@@ -38,18 +38,6 @@
         android:fragment="com.android.settings.system.ResetDashboardFragment"
         settings:controller="com.android.settings.system.ResetPreferenceController"/>
 
-    <!-- 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"
-        settings:keywords="@string/keywords_system_update_settings"
-        settings:controller="com.android.settings.system.SystemUpdatePreferenceController">
-        <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"
@@ -60,4 +48,4 @@
                 android:targetClass="@string/additional_system_update_menu" />
     </Preference>
 
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
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 929ad205d9ba00b091d6f5ec4d08f7da66f1e40f..72100933d3ec2c23ba5acdae084286e91cfb41f2 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -179,5 +179,6 @@ public class Settings extends SettingsActivity {
     public static class SystemDashboardActivity extends SettingsActivity {}
     public static class MicroGActivity extends SettingsActivity { /* empty */ }
     public static class OpenKeychainActivity extends SettingsActivity { /* empty */ }
+    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 e76e15f3dbdb2c97ebcf9892c986af2b92dadc33..e5a5c9ffdcfa83e99c580faa32472901c2806d72 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -23,6 +23,7 @@ import com.android.settings.MasterClear;
 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;
@@ -288,6 +289,7 @@ public class SettingsGateway {
             DarkModeSettingsFragment.class.getName(),
             MicroGSettings.class.getName(),
             OpenKeychainSettings.class.getName(),
+            SystemUpdaterSettings.class.getName(),
     };
 
     public static final String[] SETTINGS_FOR_RESTRICTED = {