diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index dc15524e27f1f91aa0295632503fc208d96a61cc..0bad3f30e2a345cd046c80232bde92579cc9f990 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -4286,6 +4286,12 @@
             </intent-filter>
         </activity>
 
+        <provider
+            android:name="com.android.settings.development.OTAProvider"
+            android:authorities="custom.setting.Provider.OTA_SERVER"
+            android:exported="true"
+            android:multiprocess="true" />
+
         <!-- This is the longest AndroidManifest.xml ever. -->
     </application>
 </manifest>
diff --git a/res/drawable/ic_homepage_advanced_privacy.xml b/res/drawable/ic_homepage_advanced_privacy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c75e102402bf5da2d2055fdca2e313c811a120fe
--- /dev/null
+++ b/res/drawable/ic_homepage_advanced_privacy.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2019-2022 ECORP SAS
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M15.99,4V4C15.79,3.998 15.592,4.028 15.402,4.089L5.845,8.136C5.598,8.244 5.385,8.425 5.233,8.658C5.081,8.893 5,9.17 5,9.453L5,9.455C5,19.19 10.484,25.771 15.442,27.89L15.444,27.891C15.612,27.963 15.792,28 15.974,28C16.155,28 16.335,27.963 16.504,27.891L16.507,27.889C20.475,26.204 26.995,20.295 27,9.466C26.992,9.179 26.904,8.902 26.746,8.666C26.587,8.429 26.365,8.247 26.11,8.138L15.99,4ZM15.99,4L15.996,4C16.182,4.001 16.368,4.03 16.545,4.088L26.109,8.138L15.99,4Z"
+        android:strokeWidth="2"
+        android:strokeColor="#0088ED" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19.5,12.291C20.466,13.257 20.95,14.524 20.95,15.791C20.95,17.058 20.466,18.324 19.5,19.291C18.534,20.257 17.267,20.741 16,20.741C14.733,20.741 13.466,20.258 12.5,19.291C11.533,18.324 11.05,17.058 11.05,15.791C11.05,14.524 11.533,13.257 12.5,12.291"
+        android:strokeWidth="2"
+        android:strokeColor="#0088ED"
+        android:strokeLineCap="round" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M16.101,11.4L16.101,15.864"
+        android:strokeWidth="2"
+        android:strokeColor="#0088ED"
+        android:strokeLineCap="round" />
+</vector>
diff --git a/res/layout/main_clear.xml b/res/layout/main_clear.xml
index a2464e2c986234f8c4b7035c3a0e63c7c9bf188c..618fef293a671d71ccd14b52acf756efc8ef29a7 100644
--- a/res/layout/main_clear.xml
+++ b/res/layout/main_clear.xml
@@ -42,7 +42,7 @@
                 android:id="@+id/sud_layout_description"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/main_clear_desc"/>
+                android:text="@string/main_clear_desc_e"/>
             <TextView
                 android:id="@+id/also_erases_external"
                 style="@style/TextAppearance.PreferenceTitle.SettingsLib"
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 9b3dc031340b91cd4d568d5f61cd62580cbb90c1..8a9aacd574c05284dfa51f4218f1043bf372e745 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -172,4 +172,29 @@
     <!-- FastCharge feature -->
     <string name="fast_charging_title">Fast charging</string>
     <string name="fast_charging_summary">Disable to reduce the heat produced by the device while charging or to extend the lifespan of the battery</string>
+
+    <!-- /e/ additions begin -->
+
+    <!-- /e/ version -->
+    <string name="e_version">/e/ OS version</string>
+
+    <!-- /e/ legal. -->
+    <string name="elicense_title">/e/ legal</string>
+
+    <!-- /e/ updater -->
+    <string name="system_update_summary">Updates, preferences, release notes</string>
+
+    <!-- /e/ OTA server change -->
+    <string name="title_ota_server">Connect to /e/ OS test channel</string>
+    <string name="use_ota_summary">Access test releases of /e/ OS</string>
+    <string name="use_ota_staging_popup_title">You are about to connect to /e/ OS test channel</string>
+    <string name="use_ota_staging_popup_message">It will allow you to download and install test versions of /e/ OS. Those builds may be unstable, and should be used only for test purposes. Please accept only if you know what you are doing.</string>
+
+    <!-- /e/ Advanced Privacy -->
+    <string name="advanced_privacy_dashboard_title" translatable="false">Advanced Privacy</string>
+    <string name="advanced_privacy_dashboard_summary">Manage trackers, fake location, hide IP address</string>
+
+    <!-- Factory Reset -->
+    <string name="main_clear_desc_e" product="tablet">This will erase all data from your tablet\u2019s <b>internal storage</b>, including:\n\n<li>All your account</li>\n<li>System and app data and settings</li>\n<li>Downloaded apps</li></string>
+    <string name="main_clear_desc_e" product="default">This will erase all data from your phone\u2019s <b>internal storage</b>, including:\n\n<li>All your account</li>\n<li>System and app data and settings</li>\n<li>Downloaded apps</li></string>
 </resources>
diff --git a/res/xml/about_legal.xml b/res/xml/about_legal.xml
index a36ab66a601378cfd8ebea02d27536e9fc6ffbf7..a63a74a88812efde9b8f06385d41075ab9735b7e 100644
--- a/res/xml/about_legal.xml
+++ b/res/xml/about_legal.xml
@@ -41,6 +41,12 @@
         android:title="@string/lineagelicense_title"
         settings:controller="com.android.settings.deviceinfo.legal.LineageLicensePreferenceController" />
 
+    <!-- e Foundation License information -->
+    <Preference
+        android:key="elicense"
+        android:title="@string/elicense_title"
+        settings:controller="com.android.settings.deviceinfo.legal.ELicensePreferenceController" />
+
     <!-- Terms and conditions -->
     <Preference
         android:key="terms"
diff --git a/res/xml/advanced_privacy_dashboard_settings.xml b/res/xml/advanced_privacy_dashboard_settings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8433a4402a81236aa36eb0dc34e5d3845ea86bda
--- /dev/null
+++ b/res/xml/advanced_privacy_dashboard_settings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2019-2022 ECORP SAS
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="advanced_privacy"
+    android:title="@string/advanced_privacy_dashboard_title">
+
+    <Preference>
+        <intent android:action="android.intent.action.MAIN"
+            android:targetPackage="foundation.e.advancedprivacy"
+            android:targetClass="foundation.e.privacycentralapp.main.MainActivity" />
+    </Preference>
+</PreferenceScreen>
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index b47eb691df19a3e630cf74b342e3874e8a91b1e5..740299b7ab4bd4a54f86a6c53eedcebcf74c4455 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -636,6 +636,11 @@
         <Preference
             android:key="reset_shortcut_manager_throttling"
             android:title="@string/reset_shortcut_manager_throttling" />
+
+        <SwitchPreference
+            android:key="change_update_source"
+            android:title="@string/title_ota_server"
+            android:summary="@string/use_ota_summary" />
     </PreferenceCategory>
 
     <com.android.settings.development.autofill.AutofillPreferenceCategory
diff --git a/res/xml/firmware_version.xml b/res/xml/firmware_version.xml
index 4eb25fd578626a6371e1ff7e3a69ba306c4e0aed..8d78dcd0312796cbea0b2590e2b70724c8d76516 100644
--- a/res/xml/firmware_version.xml
+++ b/res/xml/firmware_version.xml
@@ -33,8 +33,9 @@
     <!-- Lineage version -->
     <Preference
         android:key="lineage_version"
-        android:title="@*lineageos.platform:string/lineage_version"
+        android:title="@string/e_version"
         android:summary="@string/summary_placeholder"
+        android:selectable="false"
         settings:enableCopying="true"
         settings:controller="com.android.settings.deviceinfo.firmwareversion.LineageVersionDetailPreferenceController"/>
 
diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml
index 6dcfc9f8d0dc626c3b8e04560bd02fb6a911e3e2..27d6b79b1530c6927abb8e9eed5d3832452ed2cd 100644
--- a/res/xml/my_device_info.xml
+++ b/res/xml/my_device_info.xml
@@ -134,8 +134,9 @@
         <Preference
             android:key="lineage_os_version"
             android:order="43"
-            android:title="@*lineageos.platform:string/lineage_version"
+            android:title="@string/e_version"
             android:summary="@string/summary_placeholder"
+            android:selectable="false"
             settings:enableCopying="true"
             settings:controller="com.android.settings.deviceinfo.firmwareversion.LineageVersionDetailPreferenceController"/>
     </PreferenceCategory>
diff --git a/res/xml/system_dashboard_fragment.xml b/res/xml/system_dashboard_fragment.xml
index 9228ddd5f5a03bad953be0503766bd98c499f8d8..fa0d100ed81c0b9317604e4e617e80c7c360c5a6 100644
--- a/res/xml/system_dashboard_fragment.xml
+++ b/res/xml/system_dashboard_fragment.xml
@@ -54,17 +54,6 @@
                 android:targetClass="@string/additional_system_update_menu"/>
     </Preference>
 
-    <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="-58"
-        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="reset_dashboard"
         android:title="@string/reset_dashboard_title"
diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml
index 042ce43999a90602ba99b32e783df3fc73b5796d..59262c8d533cb55645bcf6079d0cb5b799d296a2 100644
--- a/res/xml/top_level_settings.xml
+++ b/res/xml/top_level_settings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
   Copyright (C) 2018 The Android Open Source Project
+  Copyright (C) 2019-2021 ECORP SAS
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -20,6 +21,17 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="top_level_settings">
 
+    <com.android.settings.widget.HomepagePreference
+        android:key="top_level_update"
+        android:title="@string/system_update_settings_list_item_title"
+        android:summary="@string/system_update_summary"
+        android:icon="@drawable/ic_system_update"
+        android:order="-160"
+        settings:controller="com.android.settings.system.SystemUpdatePreferenceController"
+        settings:keywords="@string/keywords_system_update_settings">
+        <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS" />
+    </com.android.settings.widget.HomepagePreference>
+
     <com.android.settings.widget.HomepagePreference
         android:fragment="com.android.settings.network.NetworkDashboardFragment"
         android:icon="@drawable/ic_settings_wireless"
@@ -135,6 +147,14 @@
         android:summary="@string/privacy_dashboard_summary"
         settings:highlightableMenuKey="@string/menu_key_privacy"/>
 
+    <com.android.settings.widget.HomepagePreference
+        android:key="top_level_advanced_privacy"
+        android:title="@string/advanced_privacy_dashboard_title"
+        android:summary="@string/advanced_privacy_dashboard_summary"
+        android:icon="@drawable/ic_homepage_advanced_privacy"
+        android:order="-35"
+        android:fragment="com.android.settings.privacy.AdvancedPrivacyDashboardFragment"/>
+
     <com.android.settings.widget.HomepagePreference
         android:fragment="com.android.settings.location.LocationSettings"
         android:icon="@drawable/ic_settings_location"
diff --git a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
index 42bb34a0ee444a57bfb12714883b3ffac7048588..3266e51fcfefb52cbe9c3678b7bfab12d5f7a97a 100644
--- a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
+++ b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
@@ -195,6 +195,11 @@ public class AccountTypePreferenceLoader {
         }
         ActivityInfo resolvedActivityInfo = resolveInfo.activityInfo;
         ApplicationInfo resolvedAppInfo = resolvedActivityInfo.applicationInfo;
+
+        if (resolvedActivityInfo.packageName.equals("foundation.e.drive")) {
+            return true;
+        }
+
         try {
             // Allows to launch only authenticator owned activities.
             ApplicationInfo authenticatorAppInf = pm.getApplicationInfo(authDesc.packageName, 0);
diff --git a/src/com/android/settings/accounts/MailAccountSyncHelper.java b/src/com/android/settings/accounts/MailAccountSyncHelper.java
new file mode 100644
index 0000000000000000000000000000000000000000..c48886752d3e93249a78acaba0e0b84d0345b846
--- /dev/null
+++ b/src/com/android/settings/accounts/MailAccountSyncHelper.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright ECORP SAS 2022
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.android.settings.accounts;
+
+import android.annotation.TargetApi;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+
+public class MailAccountSyncHelper {
+
+    private static final String MAIL_PACKAGE = "foundation.e.mail";
+    private static final String MAIL_RECEIVER_CLASS = "com.fsck.k9.account.AccountSyncReceiver";
+    private static final String ACTION_PREFIX = "foundation.e.accountmanager.account.";
+
+    private static MailAccountSyncHelper instance = null;
+
+    public void accountLoggedIn(Context applicationContext) {
+        if (applicationContext == null) {
+            return;
+        }
+        Intent intent = getIntent();
+        intent.setAction(ACTION_PREFIX + "create");
+        applicationContext.sendBroadcast(intent);
+    }
+
+    public void accountLoggedOut(Context applicationContext, String email) {
+        if (applicationContext == null || email == null || !email.contains("@")) {
+            return;
+        }
+        Intent intent = getIntent();
+        intent.setAction(ACTION_PREFIX + "remove");
+        intent.putExtra("account", email);
+        applicationContext.sendBroadcast(intent);
+    }
+
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1)
+    private Intent getIntent() {
+        Intent intent = new Intent();
+        intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+        intent.setComponent(new ComponentName(MAIL_PACKAGE, MAIL_RECEIVER_CLASS));
+        return intent;
+    }
+
+
+    public static MailAccountSyncHelper getInstance() {
+        if (instance == null) {
+            synchronized (MailAccountSyncHelper.class) {
+                if (instance == null) {
+                    instance = new MailAccountSyncHelper();
+                }
+            }
+        }
+        return instance;
+    }
+
+    private MailAccountSyncHelper() {
+    }
+}
diff --git a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
index 2ce220619072b0dccf7f148e3dd49c4579b1ca17..66e6c0719be3b76ac535c6d9377726b5b433c168 100644
--- a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
+++ b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
@@ -159,7 +159,10 @@ public class RemoveAccountPreferenceController extends AbstractPreferenceControl
         @Override
         public void onClick(DialogInterface dialog, int which) {
             Activity activity = getTargetFragment().getActivity();
-            AccountManager.get(activity).removeAccountAsUser(mAccount, activity,
+            AccountManager accountManager = AccountManager.get(activity);
+            String email = accountManager.getUserData(mAccount, "email_address");
+
+            accountManager.removeAccountAsUser(mAccount, activity,
                     future -> {
                         final Activity targetActivity = getTargetFragment().getActivity();
                         if (targetActivity == null || targetActivity.isFinishing()) {
@@ -181,6 +184,7 @@ public class RemoveAccountPreferenceController extends AbstractPreferenceControl
                         }
                         Log.i(TAG, "failed: " + failed);
                         if (!failed) {
+                            MailAccountSyncHelper.getInstance().accountLoggedOut(targetActivity.getApplicationContext(), email);
                             targetActivity.finish();
                         }
                     }, null, mUserHandle);
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 804f856a1397c2fb54c988a545fc62762a77faf6..2bbb36818fafd1c5cc449bc1bf2aa2e8f358a030 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -142,6 +142,7 @@ import com.android.settings.password.ChooseLockPassword;
 import com.android.settings.password.ChooseLockPattern;
 import com.android.settings.print.PrintJobSettingsFragment;
 import com.android.settings.print.PrintSettingsFragment;
+import com.android.settings.privacy.AdvancedPrivacyDashboardFragment;
 import com.android.settings.privacy.PrivacyDashboardFragment;
 import com.android.settings.security.CryptKeeperSettings;
 import com.android.settings.security.LockscreenDashboardFragment;
@@ -323,7 +324,8 @@ public class SettingsGateway {
             NetworkProviderSettings.class.getName(),
             NetworkSelectSettings.class.getName(),
             AlarmsAndRemindersDetails.class.getName(),
-            MediaManagementAppsDetails.class.getName()
+            MediaManagementAppsDetails.class.getName(),
+            AdvancedPrivacyDashboardFragment.class.getName(),
     };
 
     public static final String[] SETTINGS_FOR_RESTRICTED = {
diff --git a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
index 89b21c9ac8e58a71dfcb5dad6a6704ce304d365a..af8318b86c05371e9d09f784b0f39a99a8b40552 100644
--- a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
+++ b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
@@ -41,6 +41,7 @@ import com.android.settings.network.NetworkDashboardFragment;
 import com.android.settings.notification.ConfigureNotificationSettings;
 import com.android.settings.notification.SoundSettings;
 import com.android.settings.notification.zen.ZenModeSettings;
+import com.android.settings.privacy.AdvancedPrivacyDashboardFragment;
 import com.android.settings.privacy.PrivacyDashboardFragment;
 import com.android.settings.security.LockscreenDashboardFragment;
 import com.android.settings.security.SecuritySettings;
@@ -112,6 +113,8 @@ public class DashboardFragmentRegistry {
                 CategoryKey.CATEGORY_NIGHT_DISPLAY);
         PARENT_TO_CATEGORY_KEY_MAP.put(PrivacyDashboardFragment.class.getName(),
                 CategoryKey.CATEGORY_PRIVACY);
+        PARENT_TO_CATEGORY_KEY_MAP.put(AdvancedPrivacyDashboardFragment.class.getName(),
+                CategoryKey.CATEGORY_PRIVACY);
         PARENT_TO_CATEGORY_KEY_MAP.put(EnterprisePrivacySettings.class.getName(),
                 CategoryKey.CATEGORY_ENTERPRISE_PRIVACY);
         PARENT_TO_CATEGORY_KEY_MAP.put(LegalSettings.class.getName(),
diff --git a/src/com/android/settings/development/ChangeSourcePreferenceController.java b/src/com/android/settings/development/ChangeSourcePreferenceController.java
new file mode 100644
index 0000000000000000000000000000000000000000..d7ad8b1497ccbb75756d09b1885801791124b73c
--- /dev/null
+++ b/src/com/android/settings/development/ChangeSourcePreferenceController.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (C) 2021 ECORP SAS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.android.settings.development;
+
+import android.app.AlertDialog;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.database.Cursor;
+import android.net.Uri;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+
+public class ChangeSourcePreferenceController extends DeveloperOptionsPreferenceController implements
+        Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+
+    @VisibleForTesting
+    static final int SETTING_VALUE_ON = 1;
+    @VisibleForTesting
+    static final int SETTING_VALUE_OFF = 0;
+    private static final String CHANGE_URL_KEY = "change_update_source";
+    private final String UPDATE_URI = "content://custom.setting.Provider.OTA_SERVER/cte";
+    private String status;
+
+    public ChangeSourcePreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return CHANGE_URL_KEY;
+    }
+
+    public void updateOtaServer() {
+        if (count(OTAProvider.CONTENT_URI)) {
+            ContentValues values = new ContentValues();
+
+            if (retrieveStatus().equals("true")) {
+                values.put(OTAProvider.Status, "false");
+                mContext.getContentResolver().update(OTAProvider.CONTENT_URI, values, OTAProvider.id + "=?", new String[]{"1"});
+            } else {
+                values.put(OTAProvider.Status, "true");
+                mContext.getContentResolver().update(OTAProvider.CONTENT_URI, values, OTAProvider.id + "=?", new String[]{"1"});
+            }
+        } else {
+            ContentValues values = new ContentValues();
+            values.put(OTAProvider.Status, "true");
+            mContext.getContentResolver().insert(OTAProvider.CONTENT_URI, values);
+        }
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        ((SwitchPreference) mPreference).setChecked(isEnabled);
+        if (retrieveStatus().equals("true")) {
+            updateOtaServer();
+            return true;
+        }
+        new AlertDialog.Builder(mContext).
+                setTitle(R.string.use_ota_staging_popup_title)
+                .setMessage(mContext.getResources().getString(R.string.use_ota_staging_popup_message))
+                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int which) {
+                        ((SwitchPreference) mPreference).setChecked(true);
+                        updateOtaServer();
+                    }
+                }).setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int which) {
+                        ((SwitchPreference) mPreference).setChecked(false);
+                    }
+                }).show();
+        return false;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        if (retrieveStatus().equals("true")) {
+            ((SwitchPreference) mPreference).setChecked(true);
+        } else {
+            ((SwitchPreference) mPreference).setChecked(false);
+        }
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
+        ((SwitchPreference) mPreference).setChecked(false);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        super.onDeveloperOptionsSwitchEnabled();
+        if (!count(OTAProvider.CONTENT_URI)) {
+            ContentValues values = new ContentValues();
+            values.put(OTAProvider.Status, "false");
+            mContext.getContentResolver().insert(OTAProvider.CONTENT_URI, values);
+        }
+
+    }
+
+    public boolean count(Uri uri) {
+        Cursor cursor = mContext.getContentResolver().query(uri, new String[]{"id"},
+                null, null, null);
+        return cursor.getCount() > 0;
+    }
+
+    private String retrieveStatus() {
+        Cursor cursor = mContext.getContentResolver().query(Uri.parse(UPDATE_URI), null, OTAProvider.id + "=?", new String[]{"1"}, OTAProvider.Status);
+        if (cursor.moveToFirst()) {
+            do {
+                status = cursor.getString(cursor.getColumnIndex(OTAProvider.Status));
+            } while (cursor.moveToNext());
+        }
+        return status;
+    }
+}
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index bcc21561609e53bf2d9ced0ee34ec9ab7a84ab38..4110587d40717ba77b3257222b4d46a52c62f6ea 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2017 The Android Open Source Project
+ * Copyright (C) 2021 ECORP SAS
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -517,6 +518,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
         controllers.add(new BluetoothA2dpHwOffloadPreferenceController(context, fragment));
         controllers.add(new BluetoothMaxConnectedAudioDevicesPreferenceController(context));
         controllers.add(new ShowTapsPreferenceController(context));
+        controllers.add(new ChangeSourcePreferenceController(context));
         controllers.add(new PointerLocationPreferenceController(context));
         controllers.add(new ShowSurfaceUpdatesPreferenceController(context));
         controllers.add(new ShowLayoutBoundsPreferenceController(context));
diff --git a/src/com/android/settings/development/OTAProvider.java b/src/com/android/settings/development/OTAProvider.java
new file mode 100644
index 0000000000000000000000000000000000000000..58ec5a78294d2703bed5f2abb1a65cc5265fe1fc
--- /dev/null
+++ b/src/com/android/settings/development/OTAProvider.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2021 ECORP SAS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.ContentProvider;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.UriMatcher;
+import android.database.Cursor;
+import android.database.SQLException;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.database.sqlite.SQLiteQueryBuilder;
+import android.net.Uri;
+
+import java.util.HashMap;
+
+public class OTAProvider extends ContentProvider {
+
+    static final String PROVIDER_NAME = "custom.setting.Provider.OTA_SERVER";
+    static final String URL = "content://" + PROVIDER_NAME + "/cte";
+    static final Uri CONTENT_URI = Uri.parse(URL);
+
+    static final String id = "id";
+    static final String Status = "Status";
+    static final int uriCode = 1;
+    static final UriMatcher uriMatcher;
+    static final String DATABASE_NAME = "mydb";
+    static final String TABLE_NAME = "ota";
+    static final int DATABASE_VERSION = 1;
+    static final String CREATE_DB_TABLE = " CREATE TABLE " + TABLE_NAME
+            + " (id INTEGER PRIMARY KEY AUTOINCREMENT, "
+            + " Status TEXT NOT NULL);";
+    private static HashMap<String, String> values;
+
+    static {
+        uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+        uriMatcher.addURI(PROVIDER_NAME, "cte", uriCode);
+        uriMatcher.addURI(PROVIDER_NAME, "cte/*", uriCode);
+    }
+
+    private SQLiteDatabase db;
+
+    @Override
+    public boolean onCreate() {
+        Context context = getContext();
+        DatabaseHelper dbHelper = new DatabaseHelper(context);
+        db = dbHelper.getWritableDatabase();
+        return db != null;
+    }
+
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection,
+                        String[] selectionArgs, String sortOrder) {
+        SQLiteQueryBuilder qb = new SQLiteQueryBuilder();
+        qb.setTables(TABLE_NAME);
+
+        switch (uriMatcher.match(uri)) {
+            case uriCode:
+                qb.setProjectionMap(values);
+                break;
+            default:
+                throw new IllegalArgumentException("Unknown URI " + uri);
+        }
+        if (sortOrder == null || sortOrder == "") {
+            sortOrder = Status;
+        }
+        Cursor c = qb.query(db, projection, selection, selectionArgs, null,
+                null, sortOrder);
+        c.setNotificationUri(getContext().getContentResolver(), uri);
+        return c;
+    }
+
+
+    @Override
+    public String getType(Uri uri) {
+        switch (uriMatcher.match(uri)) {
+            case uriCode:
+                return "vnd.android.cursor.dir/cte";
+
+            default:
+                throw new IllegalArgumentException("Unsupported URI: " + uri);
+        }
+    }
+
+    @Override
+    public Uri insert(Uri uri, ContentValues values) {
+        long rowID = db.insert(TABLE_NAME, "", values);
+        if (rowID > 0) {
+            Uri _uri = ContentUris.withAppendedId(CONTENT_URI, rowID);
+            getContext().getContentResolver().notifyChange(_uri, null);
+            return _uri;
+        }
+        throw new SQLException("Failed to add a record into " + uri);
+    }
+
+    @Override
+    public int delete(Uri uri, String selection, String[] selectionArgs) {
+        int count = 0;
+        switch (uriMatcher.match(uri)) {
+            case uriCode:
+                count = db.delete(TABLE_NAME, selection, selectionArgs);
+                break;
+            default:
+                throw new IllegalArgumentException("Unknown URI " + uri);
+        }
+        getContext().getContentResolver().notifyChange(uri, null);
+        return count;
+    }
+
+    @Override
+    public int update(Uri uri, ContentValues values, String selection,
+                      String[] selectionArgs) {
+        int count = 0;
+        switch (uriMatcher.match(uri)) {
+            case uriCode:
+                count = db.update(TABLE_NAME, values, selection, selectionArgs);
+                break;
+            default:
+                throw new IllegalArgumentException("Unknown URI " + uri);
+        }
+        getContext().getContentResolver().notifyChange(uri, null);
+        return count;
+    }
+
+
+    private static class DatabaseHelper extends SQLiteOpenHelper {
+        DatabaseHelper(Context context) {
+            super(context, DATABASE_NAME, null, DATABASE_VERSION);
+        }
+
+        @Override
+        public void onCreate(SQLiteDatabase db) {
+            db.execSQL(CREATE_DB_TABLE);
+        }
+
+        @Override
+        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+            db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME);
+            onCreate(db);
+        }
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/LineageVersionDetailPreferenceController.java b/src/com/android/settings/deviceinfo/firmwareversion/LineageVersionDetailPreferenceController.java
index 6d0ca9d33b81c50b46fc496ed718f9cdc6cd20d8..146e573ca1c470aa04928d343ce98db44756b57a 100644
--- a/src/com/android/settings/deviceinfo/firmwareversion/LineageVersionDetailPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/firmwareversion/LineageVersionDetailPreferenceController.java
@@ -131,6 +131,6 @@ public class LineageVersionDetailPreferenceController extends BasePreferenceCont
     @Override
     public void copy() {
         Sliceable.setCopyContent(mContext, getSummary(),
-                mContext.getText(org.lineageos.platform.internal.R.string.lineage_version));
+                mContext.getText(R.string.e_version));
     }
 }
diff --git a/src/com/android/settings/deviceinfo/legal/ELicensePreferenceController.java b/src/com/android/settings/deviceinfo/legal/ELicensePreferenceController.java
new file mode 100644
index 0000000000000000000000000000000000000000..67d1812ddc94314837ca2ecccacc954fad18cf57
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/legal/ELicensePreferenceController.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2022 E FOUNDATION
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo.legal;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.SystemProperties;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.BasePreferenceController;
+
+public class ELicensePreferenceController extends BasePreferenceController {
+
+    private static final String PROPERTY_E_LICENSE_URL = "ro.elegal.url";
+
+    public ELicensePreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        Preference preference = screen.findPreference(getPreferenceKey());
+        if (preference != null) {
+            preference.setOnPreferenceClickListener(pref -> {
+                mContext.startActivity(getIntent());
+                return true;
+            });
+        }
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (getIntent().resolveActivity(mContext.getPackageManager()) != null) {
+            return AVAILABLE;
+        } else {
+            return UNSUPPORTED_ON_DEVICE;
+        }
+    }
+
+    private Intent getIntent() {
+        return new Intent(Intent.ACTION_VIEW,
+                Uri.parse(SystemProperties.get(PROPERTY_E_LICENSE_URL)));
+    }
+}
diff --git a/src/com/android/settings/privacy/AdvancedPrivacyDashboardFragment.java b/src/com/android/settings/privacy/AdvancedPrivacyDashboardFragment.java
new file mode 100644
index 0000000000000000000000000000000000000000..472e32282447c14eb9a95ba22d8a81acc1301504
--- /dev/null
+++ b/src/com/android/settings/privacy/AdvancedPrivacyDashboardFragment.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2019-2022 ECORP SAS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.privacy;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.fragment.app.Fragment;
+
+import com.android.settings.R;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+@SearchIndexable
+public class AdvancedPrivacyDashboardFragment extends Fragment {
+
+    private static final String privacyCentralPackageName = "foundation.e.advancedprivacy";
+    private static final String privacyCentralActivityName = "foundation.e.privacycentralapp.main.MainActivity";
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Activity activity = getActivity();
+        Intent intent = new Intent().setComponent(new ComponentName(privacyCentralPackageName,
+                privacyCentralActivityName));
+        startActivity(intent);
+
+        if (activity != null) {
+            activity.finish();
+        }
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.advanced_privacy_dashboard_settings);
+}
diff --git a/src/com/android/settings/system/SystemUpdatePreferenceController.java b/src/com/android/settings/system/SystemUpdatePreferenceController.java
index 92819d6ddf371dd0971fac80d054172d19db7d03..41f0360d540032833a2908202f2ae7d0e8a9ac78 100644
--- a/src/com/android/settings/system/SystemUpdatePreferenceController.java
+++ b/src/com/android/settings/system/SystemUpdatePreferenceController.java
@@ -43,7 +43,7 @@ public class SystemUpdatePreferenceController extends BasePreferenceController {
 
     private static final String TAG = "SysUpdatePrefContr";
 
-    private static final String KEY_SYSTEM_UPDATE_SETTINGS = "system_update_settings";
+    private static final String KEY_SYSTEM_UPDATE_SETTINGS = "top_level_update";
 
     private final UserManager mUm;
     private final SystemUpdateManager mUpdateManager;
diff --git a/tests/robotests/res/layout/main_clear.xml b/tests/robotests/res/layout/main_clear.xml
index b9a126d423fe79e563a6980083bd377e305b6a37..81fa94353f139b7bc94b52e64e4414c803fa5f5b 100644
--- a/tests/robotests/res/layout/main_clear.xml
+++ b/tests/robotests/res/layout/main_clear.xml
@@ -42,7 +42,7 @@
                 android:id="@+id/sud_layout_description"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/main_clear_desc"/>
+                android:text="@string/main_clear_desc_e"/>
             <TextView
                 android:id="@+id/also_erases_external"
                 style="@style/TextAppearance.SudGlifItemSummary"