diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2268977..d65d92d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -83,6 +83,7 @@
     <uses-permission android:name="android.permission.PEERS_MAC_ADDRESS"/>
     <uses-permission android:name="android.permission.MANAGE_NOTIFICATIONS"/>
     <uses-permission android:name="android.permission.DELETE_PACKAGES"/>
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
     <uses-permission android:name="android.permission.MANAGE_APP_OPS_RESTRICTIONS"/>
     <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/>
     <uses-permission android:name="android.permission.READ_PRINT_SERVICES" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3b474ab..bc43892 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2664,9 +2664,7 @@
     <!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
     <string name="storage_settings_summary" product="default">Unmount SD card, view available storage</string>
     <!-- About phone screen, title for IMEI for multi-sim devices -->
-    <string name="imei_multi_sim_slot_1">IMEI (sim slot 1)</string>
-    <!-- About phone screen, title for IMEI for multi-sim devices -->
-    <string name="imei_multi_sim_slot_2">IMEI (sim slot 2)</string>
+    <string name="imei_multi_sim">IMEI (sim slot %1$d)</string>
     <!-- Do not translate. About phone, status item title -->
     <string name="status_imei">IMEI</string>
     <!-- Do not translate. About phone, status item title -->
@@ -2677,6 +2675,10 @@
     <string name="status_number" product="tablet">MDN</string>
     <!-- About phone, status item title.  The phone number of the current device [CHAR LIMIT=30] -->
     <string name="status_number" product="default">Phone number</string>
+    <!-- About tablet, status item title for multi-sim devices.  The Mobile Directory Number [CHAR LIMIT=30] -->
+    <string name="status_number_sim_slot" product="tablet">MDN (sim slot %1$d)</string>
+    <!-- About phone, status item title for multi-sim devices.  The phone number of the current device [CHAR LIMIT=30] -->
+    <string name="status_number_sim_slot" product="default">Phone number (sim slot %1$d)</string>
     <!-- About tablet, status item title.  The Mobile Directory Number [CHAR LIMIT=30] -->
     <string name="status_number_sim_status" product="tablet">MDN on SIM</string>
     <!-- About phone, status item title.  The phone number of the current device [CHAR LIMIT=30] -->
@@ -2688,9 +2690,7 @@
     <!-- About phone, status item title.  The phone PRL Version of the current device.-->
     <string name="status_prl_version">PRL version</string>
     <!-- About phone screen, title for MEID for multi-sim devices -->
-    <string name="meid_multi_sim_sim_slot_1">MEID (sim slot 1)</string>
-    <!-- About phone screen, title for MEID for multi-sim devices -->
-    <string name="meid_multi_sim_sim_slot_2">MEID (sim slot 2)</string>
+    <string name="meid_multi_sim">MEID (sim slot %1$d)</string>
     <!-- About phone, status item title.  The phone MEID number of the current LTE/CDMA device. [CHAR LIMIT=30] -->
     <string name="status_meid_number">MEID</string>
     <!-- About phone, status item title.  The ICCID of the current LTE device. [CHAR LIMIT=30] -->
@@ -6447,9 +6447,7 @@
     <!-- SIM status title  [CHAR LIMIT=40] -->
     <string name="sim_status_title">SIM status</string>
     <!-- SIM status title  [CHAR LIMIT=40] -->
-    <string name="sim_status_title_sim_slot_1">SIM status (sim slot 1)</string>
-    <!-- SIM status title  [CHAR LIMIT=40] -->
-    <string name="sim_status_title_sim_slot_2">SIM status (sim slot 2)</string>
+    <string name="sim_status_title_sim_slot">SIM status (sim slot %1$d)</string>
     <!-- Title for call back. [CHAR LIMIT=60] -->
     <string name="sim_call_back_title">Call back from default SIM</string>
     <!-- Title for outgoing back. [CHAR LIMIT=60] -->
diff --git a/res/xml/device_info_settings_v2.xml b/res/xml/device_info_settings_v2.xml
index 5957c1a..9a48e96 100644
--- a/res/xml/device_info_settings_v2.xml
+++ b/res/xml/device_info_settings_v2.xml
@@ -25,51 +25,43 @@
     <!-- Phone number -->
     <Preference
         android:key="phone_number"
+        android:order="0"
         android:title="@string/status_number"
         android:summary="@string/summary_placeholder"/>
 
-    <!-- SIM status Sim Slot 1 -->
+    <!-- SIM status -->
     <Preference
-        android:key="sim_status_sim_1"
+        android:key="sim_status"
+        android:order="10"
         android:title="@string/sim_status_title"
         android:summary="@string/summary_placeholder"/>
 
-    <!-- SIM status Sim Slot 2-->
-    <Preference
-        android:key="sim_status_sim_2"
-        android:title="@string/sim_status_title_sim_slot_2"
-        android:summary="@string/summary_placeholder"/>
-
-
     <!-- Model & hardware -->
     <Preference
         android:key="device_model"
+        android:order="21"
         android:title="@string/hardware_info"
         android:summary="@string/summary_placeholder"/>
 
-    <!-- IMEI Sim Slot 1 -->
+    <!-- IMEI -->
     <Preference
-        android:key="imei_info_sim_slot_1"
+        android:key="imei_info"
+        android:order="22"
         android:title="@string/status_imei"
         settings:keywords="@string/keywords_imei_info"
         android:summary="@string/summary_placeholder"/>
 
-    <!-- IMEI Sim Slot 2 -->
-    <Preference
-        android:key="imei_info_sim_slot_2"
-        android:title="@string/imei_multi_sim_slot_2"
-        settings:keywords="@string/keywords_imei_info"
-        android:summary="@string/summary_placeholder"/>
-
     <!-- Android version -->
     <Preference
         android:key="firmware_version"
+        android:order="32"
         android:title="@string/firmware_version"
         android:summary="@string/summary_placeholder"/>
 
     <!--IP address -->
     <Preference
         android:key="wifi_ip_address"
+        android:order="33"
         android:title="@string/wifi_ip_address"
         android:summary="@string/summary_placeholder"
         settings:allowDividerAbove="true"/>
@@ -77,12 +69,14 @@
     <!-- Wi-Fi MAC address -->
     <Preference
         android:key="wifi_mac_address"
+        android:order="34"
         android:title="@string/status_wifi_mac_address"
         android:summary="@string/summary_placeholder"/>
 
     <!-- Bluetooth address -->
     <Preference
         android:key="bt_address"
+        android:order="35"
         android:title="@string/status_bt_address"
         android:summary="@string/summary_placeholder"/>
 
@@ -90,6 +84,7 @@
     <!-- Legal information -->
     <Preference
         android:key="legal_container"
+        android:order="36"
         android:title="@string/legal_information"
         android:fragment="com.android.settings.LegalSettings"
         settings:allowDividerAbove="true"/>
@@ -97,6 +92,7 @@
     <!-- Regulatory labels -->
     <Preference
         android:key="regulatory_info"
+        android:order="37"
         android:title="@string/regulatory_labels">
         <intent android:action="android.settings.SHOW_REGULATORY_INFO"/>
     </Preference>
@@ -104,6 +100,7 @@
     <!-- Safety & regulatory manual -->
     <Preference
         android:key="safety_info"
+        android:order="38"
         android:title="@string/safety_and_regulatory_info">
         <intent android:action="android.settings.SHOW_SAFETY_AND_REGULATORY_INFO"/>
     </Preference>
@@ -111,6 +108,7 @@
     <!-- Build number -->
     <Preference
         android:key="build_number"
+        android:order="39"
         android:title="@string/build_number"
         android:summary="@string/summary_placeholder"
         settings:allowDividerAbove="true"/>
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 4cabccd..6c6c9e9 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -36,17 +36,16 @@
 import com.android.settings.deviceinfo.FeedbackPreferenceController;
 import com.android.settings.deviceinfo.FirmwareVersionPreferenceController;
 import com.android.settings.deviceinfo.IpAddressPreferenceController;
-import com.android.settings.deviceinfo.WifiMacAddressPreferenceController;
-import com.android.settings.deviceinfo.imei.ImeiInfoDualSimPreferenceController;
-import com.android.settings.deviceinfo.imei.ImeiInfoPreferenceControllerV2;
 import com.android.settings.deviceinfo.KernelVersionPreferenceController;
 import com.android.settings.deviceinfo.ManualPreferenceController;
+import com.android.settings.deviceinfo.PhoneNumberPreferenceController;
 import com.android.settings.deviceinfo.RegulatoryInfoPreferenceController;
 import com.android.settings.deviceinfo.SafetyInfoPreferenceController;
 import com.android.settings.deviceinfo.SecurityPatchPreferenceController;
-import com.android.settings.deviceinfo.simstatus.SimStatusDualSimPreferenceController;
-import com.android.settings.deviceinfo.simstatus.SimStatusPreferenceControllerV2;
+import com.android.settings.deviceinfo.WifiMacAddressPreferenceController;
 import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceControllerV2;
+import com.android.settings.deviceinfo.imei.ImeiInfoPreferenceControllerV2;
+import com.android.settings.deviceinfo.simstatus.SimStatusPreferenceControllerV2;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -89,7 +88,7 @@
 
     @Override
     protected int getPreferenceScreenResId() {
-        return FeatureFlagUtils.isEnabled(DEVICE_INFO_V2)
+        return FeatureFlagUtils.isEnabled(getContext(), DEVICE_INFO_V2)
                 ? R.xml.device_info_settings_v2 : R.xml.device_info_settings;
     }
 
@@ -126,22 +125,18 @@
 
     private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
             Activity activity, Fragment fragment, Lifecycle lifecycle) {
-        if (FeatureFlagUtils.isEnabled(DEVICE_INFO_V2)) {
+        if (FeatureFlagUtils.isEnabled(context, DEVICE_INFO_V2)) {
             final List<AbstractPreferenceController> controllers = new ArrayList<>();
             // Device name
 
-            // Phone number
+            controllers.add(new PhoneNumberPreferenceController(context));
 
             controllers.add(new SimStatusPreferenceControllerV2(context, fragment));
 
-            controllers.add(new SimStatusDualSimPreferenceController(context, fragment));
-
             controllers.add(new DeviceModelPreferenceController(context, fragment));
 
             controllers.add(new ImeiInfoPreferenceControllerV2(context, fragment));
 
-            controllers.add(new ImeiInfoDualSimPreferenceController(context, fragment));
-
             controllers.add(new FirmwareVersionPreferenceControllerV2(context, fragment));
 
             controllers.add(new IpAddressPreferenceController(context, lifecycle));
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 279ff88..53cc046 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -67,7 +67,7 @@
     @Deprecated
     public static class DevelopmentSettingsActivity extends SettingsActivity {
         public static final boolean isEnabled() {
-            return FeatureFlagUtils.isEnabled(DEV_OPTION_V1);
+            return FeatureFlagUtils.isEnabled(null /* context */, DEV_OPTION_V1);
         }
     }
     public static class DevelopmentSettingsDashboardActivity extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/core/InstrumentedPreferenceFragment.java b/src/com/android/settings/core/InstrumentedPreferenceFragment.java
index ea82f13..7e37115 100644
--- a/src/com/android/settings/core/InstrumentedPreferenceFragment.java
+++ b/src/com/android/settings/core/InstrumentedPreferenceFragment.java
@@ -21,7 +21,6 @@
 import android.support.annotation.XmlRes;
 import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
-import android.util.FeatureFlagUtils;
 import android.util.Log;
 
 import com.android.settings.core.instrumentation.Instrumentable;
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
index 14f0e2c..4f4753a 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
@@ -73,7 +73,7 @@
         final ActivityManager am =
                 (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
         boolean isLowRamDevice = am.isLowRamDevice();
-        return !isLowRamDevice && !isV2Enabled();
+        return !isLowRamDevice && !isV2Enabled(context);
     }
 
     @Override
@@ -81,7 +81,7 @@
         final ActivityManager am =
                 (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
         boolean isLowRamDevice = am.isLowRamDevice();
-        return !isLowRamDevice && isV2Enabled();
+        return !isLowRamDevice && isV2Enabled(context);
     }
 
     @Override
@@ -91,8 +91,8 @@
                 "com.android.settings.intelligence.suggestions.SuggestionService");
     }
 
-    private static boolean isV2Enabled() {
-        return FeatureFlagUtils.isEnabled(SUGGESTIONS_V2) || true;
+    private static boolean isV2Enabled(Context context) {
+        return FeatureFlagUtils.isEnabled(context, SUGGESTIONS_V2) || true;
     }
 
     @Override
diff --git a/src/com/android/settings/development/featureflags/FeatureFlagPreference.java b/src/com/android/settings/development/featureflags/FeatureFlagPreference.java
index 80851d3..7da1826 100644
--- a/src/com/android/settings/development/featureflags/FeatureFlagPreference.java
+++ b/src/com/android/settings/development/featureflags/FeatureFlagPreference.java
@@ -29,7 +29,7 @@
         mKey = key;
         setKey(key);
         setTitle(key);
-        setCheckedInternal(FeatureFlagUtils.isEnabled(mKey));
+        setCheckedInternal(FeatureFlagUtils.isEnabled(context, mKey));
     }
 
     @Override
diff --git a/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java b/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java
index 5e7cd88..7934ad7 100644
--- a/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java
@@ -51,7 +51,7 @@
         super.displayPreference(screen);
         final Preference pref = screen.findPreference(KEY_DEVICE_MODEL);
         if (pref != null) {
-            if (FeatureFlagUtils.isEnabled(FeatureFlags.DEVICE_INFO_V2)) {
+            if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.DEVICE_INFO_V2)) {
                 pref.setSummary(mContext.getResources().getString(R.string.model_summary,
                         getDeviceModel()));
             } else {
diff --git a/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java b/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java
index c57a4e0..26f1ac2 100644
--- a/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java
+++ b/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java
@@ -59,7 +59,7 @@
                 DeviceModelPreferenceController.getDeviceModel());
 
         // Serial number
-        if (FeatureFlagUtils.isEnabled(FeatureFlags.DEVICE_INFO_V2)) {
+        if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DEVICE_INFO_V2)) {
             setText(content, R.id.serial_number_label, R.id.serial_number_value, getSerialNumber());
         } else {
             content.findViewById(R.id.serial_number_label).setVisibility(View.GONE);
diff --git a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
new file mode 100644
index 0000000..5edac0f
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * 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;
+
+import android.content.Context;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+import com.android.settingslib.DeviceInfoUtils;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PhoneNumberPreferenceController extends AbstractPreferenceController {
+
+    private final static String KEY_PHONE_NUMBER = "phone_number";
+
+    private final TelephonyManager mTelephonyManager;
+    private final SubscriptionManager mSubscriptionManager;
+    private final List<Preference> mPreferenceList = new ArrayList<>();
+
+    public PhoneNumberPreferenceController(Context context) {
+        super(context);
+        mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+        mSubscriptionManager = (SubscriptionManager) context.getSystemService(
+                Context.TELEPHONY_SUBSCRIPTION_SERVICE);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_PHONE_NUMBER;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        final Preference preference = screen.findPreference(getPreferenceKey());
+        mPreferenceList.add(preference);
+
+        final int phonePreferenceOrder = preference.getOrder();
+        // Add additional preferences for each sim in the device
+        for (int simSlotNumber = 1; simSlotNumber < mTelephonyManager.getPhoneCount();
+                simSlotNumber++) {
+            final Preference multiSimPreference = createNewPreference(screen.getContext());
+            multiSimPreference.setOrder(phonePreferenceOrder + simSlotNumber);
+            multiSimPreference.setKey(KEY_PHONE_NUMBER + simSlotNumber);
+            screen.addPreference(multiSimPreference);
+            mPreferenceList.add(multiSimPreference);
+        }
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        for (int simSlotNumber = 0; simSlotNumber < mPreferenceList.size(); simSlotNumber++) {
+            final Preference simStatusPreference = mPreferenceList.get(simSlotNumber);
+            simStatusPreference.setTitle(getPreferenceTitle(simSlotNumber));
+            simStatusPreference.setSummary(getPhoneNumber(simSlotNumber));
+        }
+    }
+
+    private CharSequence getPhoneNumber(int simSlot) {
+        final SubscriptionInfo subscriptionInfo = getSubscriptionInfo(simSlot);
+        if (subscriptionInfo == null) {
+            return mContext.getString(R.string.device_info_default);
+        }
+
+        return getFormattedPhoneNumber(subscriptionInfo);
+    }
+
+    private CharSequence getPreferenceTitle(int simSlot) {
+        return mTelephonyManager.getPhoneCount() > 1 ? mContext.getString(
+                R.string.status_number_sim_slot, simSlot + 1) : mContext.getString(
+                R.string.status_number);
+    }
+
+    @VisibleForTesting
+    SubscriptionInfo getSubscriptionInfo(int simSlot) {
+        final List<SubscriptionInfo> subscriptionInfoList =
+                mSubscriptionManager.getActiveSubscriptionInfoList();
+        if (subscriptionInfoList != null) {
+            for (SubscriptionInfo info : subscriptionInfoList) {
+                if (info.getSimSlotIndex() == simSlot) {
+                    return info;
+                }
+            }
+        }
+        return null;
+    }
+
+    @VisibleForTesting
+    CharSequence getFormattedPhoneNumber(SubscriptionInfo subscriptionInfo) {
+        final String phoneNumber = DeviceInfoUtils.getFormattedPhoneNumber(mContext,
+                subscriptionInfo);
+        return TextUtils.isEmpty(phoneNumber) ? mContext.getString(R.string.device_info_default)
+                : phoneNumber;
+    }
+
+    @VisibleForTesting
+    Preference createNewPreference(Context context) {
+        return new Preference(context);
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/imei/AbstractImeiInfoPreferenceController.java b/src/com/android/settings/deviceinfo/imei/AbstractImeiInfoPreferenceController.java
deleted file mode 100644
index a9871a0..0000000
--- a/src/com/android/settings/deviceinfo/imei/AbstractImeiInfoPreferenceController.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * 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.imei;
-
-import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA;
-
-import android.app.Fragment;
-import android.content.Context;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceController;
-
-/**
- * Controller that manages preference for single and dual sim devices.
- */
-public abstract class AbstractImeiInfoPreferenceController extends
-        AbstractSimStatusImeiInfoPreferenceController implements PreferenceControllerMixin {
-
-    protected final boolean mIsMultiSim;
-    protected final TelephonyManager mTelephonyManager;
-
-    private Preference mPreference;
-    private Fragment mFragment;
-
-    public AbstractImeiInfoPreferenceController(Context context, Fragment fragment) {
-        super(context);
-
-        mFragment = fragment;
-        mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-        mIsMultiSim = mTelephonyManager.getPhoneCount() > 1;
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        mPreference = screen.findPreference(getPreferenceKey());
-        if (mPreference == null) {
-            return;
-        }
-        final int phoneType = mTelephonyManager.getPhoneType();
-        if (phoneType == PHONE_TYPE_CDMA) {
-            mPreference.setTitle(getTitleForCdmaPhone());
-            mPreference.setSummary(getMeid());
-        } else {
-            // GSM phone
-            mPreference.setTitle(getTitleForGsmPhone());
-            mPreference.setSummary(mTelephonyManager.getImei(getSimSlot()));
-        }
-    }
-
-    @Override
-    public boolean handlePreferenceTreeClick(Preference preference) {
-        if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
-            return false;
-        }
-
-        ImeiInfoDialogFragment.show(mFragment, getSimSlot(), mPreference.getTitle().toString());
-        return true;
-    }
-
-    /**
-     * @return The preference title for phones based on CDMA technology.
-     */
-    protected abstract String getTitleForCdmaPhone();
-
-    /**
-     * @return The preference title for phones based on GSM technology.
-     */
-    protected abstract String getTitleForGsmPhone();
-
-    /**
-     * @return The sim slot to retrieve IMEI/CDMA information about.
-     */
-    protected abstract int getSimSlot();
-
-    @VisibleForTesting
-    String getMeid() {
-        return mTelephonyManager.getMeid(getSimSlot());
-    }
-}
diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoDualSimPreferenceController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoDualSimPreferenceController.java
deleted file mode 100644
index 61d99b9..0000000
--- a/src/com/android/settings/deviceinfo/imei/ImeiInfoDualSimPreferenceController.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * 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.imei;
-
-import android.app.Fragment;
-import android.content.Context;
-
-import com.android.settings.R;
-
-public class ImeiInfoDualSimPreferenceController extends AbstractImeiInfoPreferenceController {
-
-    private static final String KEY_IMEI_INFO_DUAL_SIM = "imei_info_sim_slot_2";
-    private static final int SIM_SLOT = 1;
-
-    public ImeiInfoDualSimPreferenceController(Context context, Fragment fragment) {
-        super(context, fragment);
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return super.isAvailable() && mIsMultiSim;
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_IMEI_INFO_DUAL_SIM;
-    }
-
-    @Override
-    protected String getTitleForCdmaPhone() {
-        return mContext.getResources().getString(R.string.meid_multi_sim_sim_slot_2);
-    }
-
-    @Override
-    protected String getTitleForGsmPhone() {
-        return mContext.getResources().getString(R.string.imei_multi_sim_slot_2);
-    }
-
-    @Override
-    protected int getSimSlot() {
-        return SIM_SLOT;
-    }
-}
diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerV2.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerV2.java
index 74448bb..dcc6db6 100644
--- a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerV2.java
+++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerV2.java
@@ -16,19 +16,41 @@
 
 package com.android.settings.deviceinfo.imei;
 
+import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA;
+
 import android.app.Fragment;
 import android.content.Context;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.telephony.TelephonyManager;
 
 import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceController;
 
-public class ImeiInfoPreferenceControllerV2 extends AbstractImeiInfoPreferenceController {
+import java.util.ArrayList;
+import java.util.List;
 
-    public static final int SIM_SLOT = 0;
+/**
+ * Controller that manages preference for single and multi sim devices.
+ */
+public class ImeiInfoPreferenceControllerV2 extends
+        AbstractSimStatusImeiInfoPreferenceController implements PreferenceControllerMixin {
 
-    private static final String KEY_IMEI_INFO = "imei_info_sim_slot_1";
+    private static final String KEY_IMEI_INFO = "imei_info";
+
+    private final boolean mIsMultiSim;
+    private final TelephonyManager mTelephonyManager;
+    private final List<Preference> mPreferenceList = new ArrayList<>();
+    private final Fragment mFragment;
 
     public ImeiInfoPreferenceControllerV2(Context context, Fragment fragment) {
-        super(context, fragment);
+        super(context);
+
+        mFragment = fragment;
+        mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+        mIsMultiSim = mTelephonyManager.getPhoneCount() > 1;
     }
 
     @Override
@@ -37,19 +59,69 @@
     }
 
     @Override
-    protected String getTitleForCdmaPhone() {
-        return mIsMultiSim ? mContext.getResources().getString(R.string.meid_multi_sim_sim_slot_1)
-                : mContext.getResources().getString(R.string.status_meid_number);
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        final Preference preference = screen.findPreference(getPreferenceKey());
+        if (!isAvailable() || preference == null || !preference.isVisible()) {
+            return;
+        }
+
+        mPreferenceList.add(preference);
+        updatePreference(preference, 0 /* sim slot */);
+
+        final int imeiPreferenceOrder = preference.getOrder();
+        // Add additional preferences for each sim in the device
+        for (int simSlotNumber = 1; simSlotNumber < mTelephonyManager.getPhoneCount();
+                simSlotNumber++) {
+            final Preference multiSimPreference = createNewPreference(screen.getContext());
+            multiSimPreference.setOrder(imeiPreferenceOrder + simSlotNumber);
+            multiSimPreference.setKey(KEY_IMEI_INFO + simSlotNumber);
+            screen.addPreference(multiSimPreference);
+            mPreferenceList.add(multiSimPreference);
+            updatePreference(multiSimPreference, simSlotNumber);
+        }
     }
 
     @Override
-    protected String getTitleForGsmPhone() {
-        return mIsMultiSim ? mContext.getResources().getString(R.string.imei_multi_sim_slot_1)
-                : mContext.getResources().getString(R.string.status_imei);
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        final int simSlot = mPreferenceList.indexOf(preference);
+        if (simSlot == -1) {
+            return false;
+        }
+
+        ImeiInfoDialogFragment.show(mFragment, simSlot, preference.getTitle().toString());
+        return true;
     }
 
-    @Override
-    protected int getSimSlot() {
-        return SIM_SLOT;
+    private void updatePreference(Preference preference, int simSlot) {
+        final int phoneType = mTelephonyManager.getPhoneType();
+        if (phoneType == PHONE_TYPE_CDMA) {
+            preference.setTitle(getTitleForCdmaPhone(simSlot));
+            preference.setSummary(getMeid(simSlot));
+        } else {
+            // GSM phone
+            preference.setTitle(getTitleForGsmPhone(simSlot));
+            preference.setSummary(mTelephonyManager.getImei(simSlot));
+        }
+    }
+
+    private CharSequence getTitleForGsmPhone(int simSlot) {
+        return mIsMultiSim ? mContext.getString(R.string.imei_multi_sim, simSlot + 1)
+                : mContext.getString(R.string.status_imei);
+    }
+
+    private CharSequence getTitleForCdmaPhone(int simSlot) {
+        return mIsMultiSim ? mContext.getString(R.string.meid_multi_sim, simSlot + 1)
+                : mContext.getString(R.string.status_meid_number);
+    }
+
+    @VisibleForTesting
+    String getMeid(int simSlot) {
+        return mTelephonyManager.getMeid(simSlot);
+    }
+
+    @VisibleForTesting
+    Preference createNewPreference(Context context) {
+        return new Preference(context);
     }
 }
diff --git a/src/com/android/settings/deviceinfo/simstatus/AbstractSimStatusPreferenceController.java b/src/com/android/settings/deviceinfo/simstatus/AbstractSimStatusPreferenceController.java
deleted file mode 100644
index 6107bf5..0000000
--- a/src/com/android/settings/deviceinfo/simstatus/AbstractSimStatusPreferenceController.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * 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.simstatus;
-
-import android.app.Fragment;
-import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceController;
-
-import java.util.List;
-
-public abstract class AbstractSimStatusPreferenceController extends
-        AbstractSimStatusImeiInfoPreferenceController implements PreferenceControllerMixin {
-
-    protected final boolean mIsMultiSim;
-    protected final TelephonyManager mTelephonyManager;
-    private final SubscriptionManager mSubscriptionManager;
-    private final Fragment mFragment;
-
-    private Preference mPreference;
-
-    public AbstractSimStatusPreferenceController(Context context, Fragment fragment) {
-        super(context);
-
-        mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-        mSubscriptionManager = (SubscriptionManager) context.getSystemService(
-                Context.TELEPHONY_SUBSCRIPTION_SERVICE);
-        mFragment = fragment;
-        mIsMultiSim = mTelephonyManager.getPhoneCount() > 1;
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        mPreference = screen.findPreference(getPreferenceKey());
-        if (mPreference == null) {
-            return;
-        }
-
-        mPreference.setTitle(getPreferenceTitle());
-        mPreference.setSummary(getCarrierName());
-    }
-
-    @Override
-    public boolean handlePreferenceTreeClick(Preference preference) {
-        if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
-            return false;
-        }
-
-        SimStatusDialogFragment.show(mFragment, getSimSlot(), getPreferenceTitle());
-        return true;
-    }
-
-    /**
-     * @return The preference title for the displayed preference.
-     */
-    protected abstract String getPreferenceTitle();
-
-    /**
-     * @return The sim slot to retrieve sim status information about.
-     */
-    protected abstract int getSimSlot();
-
-    private CharSequence getCarrierName() {
-        final List<SubscriptionInfo> subscriptionInfoList =
-                mSubscriptionManager.getActiveSubscriptionInfoList();
-        if (subscriptionInfoList != null) {
-            for (SubscriptionInfo info : subscriptionInfoList) {
-                if (info.getSimSlotIndex() == getSimSlot()) {
-                    return info.getCarrierName();
-                }
-            }
-        }
-        return mContext.getText(R.string.device_info_not_available);
-    }
-}
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDualSimPreferenceController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDualSimPreferenceController.java
deleted file mode 100644
index ce73a29..0000000
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDualSimPreferenceController.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * 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.simstatus;
-
-import android.app.Fragment;
-import android.content.Context;
-
-import com.android.settings.R;
-
-public class SimStatusDualSimPreferenceController extends AbstractSimStatusPreferenceController {
-
-    private static final int SIM_SLOT = 1;
-    private static final String SIM_STATUS_DUAL_SIM_KEY = "sim_status_sim_2";
-
-    public SimStatusDualSimPreferenceController(Context context, Fragment fragment) {
-        super(context, fragment);
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return super.isAvailable() && mIsMultiSim;
-    }
-
-    @Override
-    protected String getPreferenceTitle() {
-        return mContext.getResources().getString(R.string.sim_status_title_sim_slot_2);
-    }
-
-    @Override
-    protected int getSimSlot() {
-        return SIM_SLOT;
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return SIM_STATUS_DUAL_SIM_KEY;
-    }
-}
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerV2.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerV2.java
index ee16eac..55493dc 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerV2.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerV2.java
@@ -18,32 +18,107 @@
 
 import android.app.Fragment;
 import android.content.Context;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
 
 import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceController;
 
-public class SimStatusPreferenceControllerV2 extends AbstractSimStatusPreferenceController {
+import java.util.ArrayList;
+import java.util.List;
 
-    public static final int SIM_SLOT = 0;
+public class SimStatusPreferenceControllerV2 extends
+        AbstractSimStatusImeiInfoPreferenceController implements PreferenceControllerMixin {
 
-    private static final String KEY_SIM_1_STATUS = "sim_status_sim_1";
+    private static final String KEY_SIM_STATUS = "sim_status";
+
+    private final TelephonyManager mTelephonyManager;
+    private final SubscriptionManager mSubscriptionManager;
+    private final Fragment mFragment;
+    private final List<Preference> mPreferenceList = new ArrayList<>();
 
     public SimStatusPreferenceControllerV2(Context context, Fragment fragment) {
-        super(context, fragment);
-    }
+        super(context);
 
-    @Override
-    protected String getPreferenceTitle() {
-        return mIsMultiSim ? mContext.getResources().getString(R.string.sim_status_title_sim_slot_1)
-                : mContext.getResources().getString(R.string.sim_status_title);
-    }
-
-    @Override
-    protected int getSimSlot() {
-        return SIM_SLOT;
+        mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+        mSubscriptionManager = (SubscriptionManager) context.getSystemService(
+                Context.TELEPHONY_SUBSCRIPTION_SERVICE);
+        mFragment = fragment;
     }
 
     @Override
     public String getPreferenceKey() {
-        return KEY_SIM_1_STATUS;
+        return KEY_SIM_STATUS;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        final Preference preference = screen.findPreference(getPreferenceKey());
+        if (!isAvailable() || preference == null || !preference.isVisible()) {
+            return;
+        }
+
+        mPreferenceList.add(preference);
+
+        final int simStatusOrder = preference.getOrder();
+        // Add additional preferences for each sim in the device
+        for (int simSlotNumber = 1; simSlotNumber < mTelephonyManager.getPhoneCount();
+                simSlotNumber++) {
+            final Preference multiSimPreference = createNewPreference(screen.getContext());
+            multiSimPreference.setOrder(simStatusOrder + simSlotNumber);
+            multiSimPreference.setKey(KEY_SIM_STATUS + simSlotNumber);
+            screen.addPreference(multiSimPreference);
+            mPreferenceList.add(multiSimPreference);
+        }
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        for (int simSlotNumber = 0; simSlotNumber < mPreferenceList.size(); simSlotNumber++) {
+            final Preference simStatusPreference = mPreferenceList.get(simSlotNumber);
+            simStatusPreference.setTitle(getPreferenceTitle(simSlotNumber /* sim slot */));
+            simStatusPreference.setSummary(getCarrierName(simSlotNumber /* sim slot */));
+        }
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        final int simSlot = mPreferenceList.indexOf(preference);
+        if (simSlot == -1) {
+            return false;
+        }
+
+        SimStatusDialogFragment.show(mFragment, simSlot, getPreferenceTitle(simSlot));
+        return true;
+    }
+
+    private String getPreferenceTitle(int simSlot) {
+        return mTelephonyManager.getPhoneCount() > 1 ? mContext.getString(
+                R.string.sim_status_title_sim_slot, simSlot + 1) : mContext.getString(
+                R.string.sim_status_title);
+    }
+
+    private CharSequence getCarrierName(int simSlot) {
+        final List<SubscriptionInfo> subscriptionInfoList =
+                mSubscriptionManager.getActiveSubscriptionInfoList();
+        if (subscriptionInfoList != null) {
+            for (SubscriptionInfo info : subscriptionInfoList) {
+                if (info.getSimSlotIndex() == simSlot) {
+                    return info.getCarrierName();
+                }
+            }
+        }
+        return mContext.getText(R.string.device_info_not_available);
+    }
+
+    @VisibleForTesting
+    Preference createNewPreference(Context context) {
+        return new Preference(context);
     }
 }
diff --git a/src/com/android/settings/search/SearchFeatureProvider.java b/src/com/android/settings/search/SearchFeatureProvider.java
index 467deef..d0c0cd9 100644
--- a/src/com/android/settings/search/SearchFeatureProvider.java
+++ b/src/com/android/settings/search/SearchFeatureProvider.java
@@ -17,6 +17,7 @@
 package com.android.settings.search;
 
 import android.annotation.NonNull;
+import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -167,18 +168,18 @@
     /**
      * Initializes the search toolbar.
      */
-    default void initSearchToolbar(Context context, Toolbar toolbar) {
-        if (context == null || toolbar == null) {
+    default void initSearchToolbar(Activity activity, Toolbar toolbar) {
+        if (activity == null || toolbar == null) {
             return;
         }
         toolbar.setOnClickListener(tb -> {
             final Intent intent;
-            if (FeatureFlagUtils.isEnabled(FeatureFlags.SEARCH_V2)) {
+            if (FeatureFlagUtils.isEnabled(activity, FeatureFlags.SEARCH_V2)) {
                 intent = new Intent("com.android.settings.action.SETTINGS_SEARCH");
             } else {
-                intent = new Intent(context, SearchActivity.class);
+                intent = new Intent(activity, SearchActivity.class);
             }
-            context.startActivity(intent);
+            activity.startActivityForResult(intent, 0 /* requestCode */);
         });
     }
 }
diff --git a/tests/robotests/src/android/util/FeatureFlagUtils.java b/tests/robotests/src/android/util/FeatureFlagUtils.java
index 500884a..189336b 100644
--- a/tests/robotests/src/android/util/FeatureFlagUtils.java
+++ b/tests/robotests/src/android/util/FeatureFlagUtils.java
@@ -16,6 +16,7 @@
 
 package android.util;
 
+import android.content.Context;
 import android.os.SystemProperties;
 import android.text.TextUtils;
 
@@ -35,7 +36,7 @@
      * @param feature the flag name
      * @return true if the flag is enabled (either by default in system, or override by user)
      */
-    public static boolean isEnabled(String feature) {
+    public static boolean isEnabled(Context context, String feature) {
         // Tries to get feature flag from system property.
         // Step 1: check if feature flag has any override. Flag name: sys.fflag.override.<feature>
         String value = SystemProperties.get(FFLAG_OVERRIDE_PREFIX + feature);
@@ -54,7 +55,6 @@
         SystemProperties.set(FFLAG_OVERRIDE_PREFIX + feature, enabled ? "true" : "false");
     }
 
-
     public static Map<String, String> getAllFeatureFlags() {
         final Map<String, String> features = new HashMap<>();
         features.put(FFLAG_PREFIX + "abc", "false");
diff --git a/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java b/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java
index 09ee15f..8cedaf1 100644
--- a/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java
@@ -46,7 +46,7 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(
     manifest = TestConfig.MANIFEST_PATH,
-    sdk = TestConfig.SDK_VERSION,
+    sdk = TestConfig.SDK_VERSION_O,
     shadows = {ShadowUtils.class, ShadowConnectivityManager.class}
 )
 public class DeviceInfoSettingsTest {
diff --git a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java
index 126a346..16b1f61 100644
--- a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java
+++ b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java
@@ -35,7 +35,7 @@
  * for conformance.
  */
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
         assetDir = "/tests/robotests/assets")
 public class CodeInspectionTest {
 
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java
index a927306..88c184c 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java
@@ -15,18 +15,20 @@
  */
 package com.android.settings.core.instrumentation;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.os.Bundle;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
-import static com.google.common.truth.Truth.assertThat;
-
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class InstrumentedDialogFragmentTest {
 
     public static class TestDialogFragment extends InstrumentedDialogFragment {
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
index ff91c40..a7c95b6 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
@@ -15,15 +15,22 @@
  */
 package com.android.settings.core.instrumentation;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.util.Pair;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -39,15 +46,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class MetricsFeatureProviderTest {
     private static int CATEGORY = 10;
     private static boolean SUBTYPE_BOOLEAN = true;
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java
index bb41cf0..3ad70ab 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java
@@ -15,13 +15,24 @@
  */
 package com.android.settings.core.instrumentation;
 
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_SETTINGS_PREFERENCE_CHANGE;
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_FLOAT_VALUE;
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE;
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.argThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.Pair;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import com.google.common.truth.Platform;
 
@@ -34,23 +45,8 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
-        .ACTION_SETTINGS_PREFERENCE_CHANGE;
-import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
-        .FIELD_SETTINGS_PREFERENCE_CHANGE_FLOAT_VALUE;
-import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
-        .FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE;
-import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
-        .FIELD_SETTINGS_PREFERENCE_CHANGE_NAME;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class SharedPreferenceLoggerTest {
 
     private static final String TEST_TAG = "tag";
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java
index 1a47a66..b12d9d6 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java
@@ -44,7 +44,7 @@
 
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class VisibilityLoggerMixinTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java
index e505d03..fabf3b6 100644
--- a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java
@@ -40,7 +40,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class FeatureFlagPreferenceControllerTest {
 
     @Mock
diff --git a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceTest.java b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceTest.java
index 11099b1..35ad7e1 100644
--- a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceTest.java
@@ -30,7 +30,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class FeatureFlagPreferenceTest {
 
     private static final String KEY = "feature_key";
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java
index 108d342..aa86fd9 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java
@@ -16,13 +16,20 @@
 package com.android.settings.deviceinfo;
 
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.app.Fragment;
 import android.content.Context;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -32,15 +39,8 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class DeviceModelPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java
index 15461cc2..e56a2b2 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java
@@ -38,7 +38,7 @@
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
 public class HardwareInfoDialogFragmentTest {
 
     private Activity mActivity;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java
new file mode 100644
index 0000000..37c814a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * 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;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.telephony.SubscriptionInfo;
+import android.telephony.TelephonyManager;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
+public class PhoneNumberPreferenceControllerTest {
+
+    @Mock
+    private Preference mPreference;
+    @Mock
+    private Preference mSecondPreference;
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private SubscriptionInfo mSubscriptionInfo;
+    @Mock
+    private PreferenceScreen mScreen;
+
+    private Context mContext;
+    private PhoneNumberPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = spy(new PhoneNumberPreferenceController(mContext));
+        ReflectionHelpers.setField(mController, "mTelephonyManager", mTelephonyManager);
+        final String prefKey = mController.getPreferenceKey();
+        when(mScreen.findPreference(prefKey)).thenReturn(mPreference);
+        when(mScreen.getContext()).thenReturn(mContext);
+        doReturn(mSubscriptionInfo).when(mController).getSubscriptionInfo(anyInt());
+        doReturn(mSecondPreference).when(mController).createNewPreference(mContext);
+        when(mPreference.isVisible()).thenReturn(true);
+    }
+
+    @Test
+    public void displayPreference_multiSim_shouldAddSecondPreference() {
+        when(mTelephonyManager.getPhoneCount()).thenReturn(2);
+
+        mController.displayPreference(mScreen);
+
+        verify(mScreen).addPreference(mSecondPreference);
+    }
+
+    @Test
+    public void updateState_singleSim_shouldUpdateTitleAndPhoneNumber() {
+        final String phoneNumber = "1111111111";
+        doReturn(phoneNumber).when(mController).getFormattedPhoneNumber(mSubscriptionInfo);
+        when(mTelephonyManager.getPhoneCount()).thenReturn(1);
+        mController.displayPreference(mScreen);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setTitle(mContext.getString(R.string.status_number));
+        verify(mPreference).setSummary(phoneNumber);
+    }
+
+    @Test
+    public void updateState_multiSim_shouldUpdateTitleAndPhoneNumberOfMultiplePreferences() {
+        final String phoneNumber = "1111111111";
+        doReturn(phoneNumber).when(mController).getFormattedPhoneNumber(mSubscriptionInfo);
+        when(mTelephonyManager.getPhoneCount()).thenReturn(2);
+        mController.displayPreference(mScreen);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setTitle(
+                mContext.getString(R.string.status_number_sim_slot, 1 /* sim slot */));
+        verify(mPreference).setSummary(phoneNumber);
+        verify(mSecondPreference).setTitle(
+                mContext.getString(R.string.status_number_sim_slot, 2 /* sim slot */));
+        verify(mSecondPreference).setSummary(phoneNumber);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/AbstractImeiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/AbstractImeiInfoPreferenceControllerTest.java
deleted file mode 100644
index 51e6005..0000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/imei/AbstractImeiInfoPreferenceControllerTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * 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.imei;
-
-import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA;
-import static android.telephony.TelephonyManager.PHONE_TYPE_GSM;
-
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.content.Context;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.telephony.TelephonyManager;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AbstractImeiInfoPreferenceControllerTest {
-
-    @Mock
-    private Preference mPreference;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private Fragment mFragment;
-
-    private Context mContext;
-    private AbstractImeiInfoPreferenceControllerImpl mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
-        mController = new AbstractImeiInfoPreferenceControllerImpl(mContext, mFragment);
-        ReflectionHelpers.setField(mController, "mTelephonyManager", mTelephonyManager);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
-    }
-
-    @Test
-    public void displayPreference_cdmaPhone_shouldSetCdmaTitleAndMeid() {
-        mController = spy(mController);
-        final String meid = "125132215123";
-        when(mTelephonyManager.getPhoneType()).thenReturn(PHONE_TYPE_CDMA);
-        doReturn(meid).when(mController).getMeid();
-
-        mController.displayPreference(mScreen);
-
-        verify(mPreference).setTitle(mController.getTitleForCdmaPhone());
-        verify(mPreference).setSummary(meid);
-    }
-
-    @Test
-    public void displayPreference_gsmPhone_shouldSetGsmTitleAndImei() {
-        final String imei = "125132215123";
-        when(mTelephonyManager.getPhoneType()).thenReturn(PHONE_TYPE_GSM);
-        when(mTelephonyManager.getImei(anyInt())).thenReturn(imei);
-
-        mController.displayPreference(mScreen);
-
-        verify(mPreference).setTitle(mController.getTitleForGsmPhone());
-        verify(mPreference).setSummary(imei);
-    }
-
-    @Test
-    public void handlePreferenceTreeClick_shouldStartDialogFragment() {
-        when(mFragment.getChildFragmentManager()).thenReturn(
-                mock(FragmentManager.class, Answers.RETURNS_DEEP_STUBS));
-        when(mPreference.getTitle()).thenReturn("SomeTitle");
-        mController.displayPreference(mScreen);
-
-        mController.handlePreferenceTreeClick(mPreference);
-
-        verify(mFragment).getChildFragmentManager();
-    }
-
-    public class AbstractImeiInfoPreferenceControllerImpl extends
-            AbstractImeiInfoPreferenceController {
-
-        public AbstractImeiInfoPreferenceControllerImpl(Context context, Fragment fragment) {
-            super(context, fragment);
-        }
-
-        @Override
-        public String getPreferenceKey() {
-            return "foobar";
-        }
-
-        @Override
-        protected String getTitleForCdmaPhone() {
-            return "foo";
-        }
-
-        @Override
-        protected String getTitleForGsmPhone() {
-            return "bar";
-        }
-
-        @Override
-        protected int getSimSlot() {
-            return 0;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDualSimPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDualSimPreferenceControllerTest.java
deleted file mode 100644
index ce99ee4..0000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDualSimPreferenceControllerTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * 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.imei;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.app.Fragment;
-import android.content.Context;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.telephony.TelephonyManager;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class ImeiInfoDualSimPreferenceControllerTest {
-
-    @Mock
-    private Preference mPreference;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private Fragment mFragment;
-
-    private Context mContext;
-    private ImeiInfoDualSimPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
-        mController = new ImeiInfoDualSimPreferenceController(mContext, mFragment);
-        ReflectionHelpers.setField(mController, "mTelephonyManager", mTelephonyManager);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
-    }
-
-    @Test
-    public void getTitleForCdmaPhone_shouldReturnCdmaMultiSimString() {
-        ReflectionHelpers.setField(mController, "mIsMultiSim", true);
-
-        assertThat(mController.getTitleForCdmaPhone()).isEqualTo(mContext.getResources().getString(
-                R.string.meid_multi_sim_sim_slot_2));
-    }
-
-    @Test
-    public void getTitleForGsmPhone_shouldReturnGsmMultiSimString() {
-        ReflectionHelpers.setField(mController, "mIsMultiSim", true);
-
-        assertThat(mController.getTitleForGsmPhone()).isEqualTo(mContext.getResources().getString(
-                R.string.imei_multi_sim_slot_2));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerV2Test.java
index 233e27e..3fed589 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerV2Test.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerV2Test.java
@@ -16,13 +16,19 @@
 
 package com.android.settings.deviceinfo.imei;
 
-import static com.google.common.truth.Truth.assertThat;
+import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA;
+import static android.telephony.TelephonyManager.PHONE_TYPE_GSM;
 
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.app.Fragment;
+import android.app.FragmentManager;
 import android.content.Context;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
@@ -36,6 +42,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
@@ -49,6 +56,8 @@
     @Mock
     private Preference mPreference;
     @Mock
+    private Preference mSecondSimPreference;
+    @Mock
     private PreferenceScreen mScreen;
     @Mock
     private TelephonyManager mTelephonyManager;
@@ -65,41 +74,97 @@
         MockitoAnnotations.initMocks(this);
         mContext = spy(RuntimeEnvironment.application);
         doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
-        mController = new ImeiInfoPreferenceControllerV2(mContext, mFragment);
+        mController = spy(new ImeiInfoPreferenceControllerV2(mContext, mFragment));
+        doReturn(true).when(mController).isAvailable();
+        when(mScreen.getContext()).thenReturn(mContext);
+        doReturn(mSecondSimPreference).when(mController).createNewPreference(mContext);
         ReflectionHelpers.setField(mController, "mTelephonyManager", mTelephonyManager);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
+        final String prefKey = mController.getPreferenceKey();
+        when(mPreference.getKey()).thenReturn(prefKey);
+        when(mPreference.isVisible()).thenReturn(true);
     }
 
     @Test
-    public void getTitleForCdmaPhone_noMultiSim_shouldReturnCdmaNoMultiSimString() {
-        ReflectionHelpers.setField(mController, "mIsMultiSim", false);
-
-        assertThat(mController.getTitleForCdmaPhone()).isEqualTo(mContext.getResources().getString(
-                R.string.status_meid_number));
-    }
-
-    @Test
-    public void getTitleForCdmaPhone_multiSim_shouldReturnCdmaMultiSimString() {
+    public void displayPreference_multiSimGsm_shouldAddSecondPreference() {
         ReflectionHelpers.setField(mController, "mIsMultiSim", true);
+        when(mTelephonyManager.getPhoneCount()).thenReturn(2);
+        when(mTelephonyManager.getPhoneType()).thenReturn(PHONE_TYPE_GSM);
 
-        assertThat(mController.getTitleForCdmaPhone()).isEqualTo(mContext.getResources().getString(
-                R.string.meid_multi_sim_sim_slot_1));
+        mController.displayPreference(mScreen);
+
+        verify(mScreen).addPreference(mSecondSimPreference);
     }
 
     @Test
-    public void getTitleForGsmPhone_noMultiSim_shouldReturnGsmNoMultiSimString() {
+    public void displayPreference_singleSimCdmaPhone_shouldSetSingleSimCdmaTitleAndMeid() {
         ReflectionHelpers.setField(mController, "mIsMultiSim", false);
+        final String meid = "125132215123";
+        when(mTelephonyManager.getPhoneType()).thenReturn(PHONE_TYPE_CDMA);
+        doReturn(meid).when(mController).getMeid(anyInt());
 
-        assertThat(mController.getTitleForGsmPhone()).isEqualTo(mContext.getResources().getString(
-                R.string.status_imei));
+        mController.displayPreference(mScreen);
+
+        verify(mPreference).setTitle(mContext.getString(R.string.status_meid_number));
+        verify(mPreference).setSummary(meid);
     }
 
     @Test
-    public void getTitleForGsmPhone_multiSim_shouldReturnGsmMultiSimString() {
+    public void displayPreference_multiSimCdmaPhone_shouldSetMultiSimCdmaTitleAndMeid() {
         ReflectionHelpers.setField(mController, "mIsMultiSim", true);
+        final String meid = "125132215123";
+        when(mTelephonyManager.getPhoneCount()).thenReturn(2);
+        when(mTelephonyManager.getPhoneType()).thenReturn(PHONE_TYPE_CDMA);
+        doReturn(meid).when(mController).getMeid(anyInt());
 
-        assertThat(mController.getTitleForGsmPhone()).isEqualTo(mContext.getResources().getString(
-                R.string.imei_multi_sim_slot_1));
+        mController.displayPreference(mScreen);
+
+        verify(mPreference).setTitle(mContext.getString(R.string.meid_multi_sim, 1 /* sim slot */));
+        verify(mSecondSimPreference).setTitle(
+                mContext.getString(R.string.meid_multi_sim, 2 /* sim slot */));
+        verify(mPreference).setSummary(meid);
+        verify(mSecondSimPreference).setSummary(meid);
+    }
+
+    @Test
+    public void displayPreference_singleSimGsmPhone_shouldSetSingleSimGsmTitleAndImei() {
+        ReflectionHelpers.setField(mController, "mIsMultiSim", false);
+        final String imei = "125132215123";
+        when(mTelephonyManager.getPhoneType()).thenReturn(PHONE_TYPE_GSM);
+        when(mTelephonyManager.getImei(anyInt())).thenReturn(imei);
+
+        mController.displayPreference(mScreen);
+
+        verify(mPreference).setTitle(mContext.getString(R.string.status_imei));
+        verify(mPreference).setSummary(imei);
+    }
+
+    @Test
+    public void displayPreference_multiSimGsmPhone_shouldSetMultiSimGsmTitleAndImei() {
+        ReflectionHelpers.setField(mController, "mIsMultiSim", true);
+        final String imei = "125132215123";
+        when(mTelephonyManager.getPhoneCount()).thenReturn(2);
+        when(mTelephonyManager.getPhoneType()).thenReturn(PHONE_TYPE_GSM);
+        when(mTelephonyManager.getImei(anyInt())).thenReturn(imei);
+
+        mController.displayPreference(mScreen);
+
+        verify(mPreference).setTitle(mContext.getString(R.string.imei_multi_sim, 1 /* sim slot */));
+        verify(mSecondSimPreference).setTitle(
+                mContext.getString(R.string.imei_multi_sim, 2 /* sim slot */));
+        verify(mPreference).setSummary(imei);
+        verify(mSecondSimPreference).setSummary(imei);
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_shouldStartDialogFragment() {
+        when(mFragment.getChildFragmentManager()).thenReturn(
+                mock(FragmentManager.class, Answers.RETURNS_DEEP_STUBS));
+        when(mPreference.getTitle()).thenReturn("SomeTitle");
+        mController.displayPreference(mScreen);
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        verify(mFragment).getChildFragmentManager();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/AbstractSimStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/AbstractSimStatusPreferenceControllerTest.java
deleted file mode 100644
index ee749d0..0000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/AbstractSimStatusPreferenceControllerTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * 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.simstatus;
-
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.content.Context;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AbstractSimStatusPreferenceControllerTest {
-
-    @Mock
-    private Preference mPreference;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private Fragment mFragment;
-
-    private Context mContext;
-    private AbstractSimStatusPreferenceControllerImpl mController;
-
-    @Before
-    public void setup() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
-        mController = new AbstractSimStatusPreferenceControllerImpl(mContext, mFragment);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
-    }
-
-    @Test
-    public void displayPreference_shouldSetTitleAndSummary() {
-        mController.displayPreference(mScreen);
-
-        verify(mPreference).setTitle(mController.getPreferenceTitle());
-        verify(mPreference).setSummary(anyString());
-    }
-
-    @Test
-    public void handlePreferenceTreeClick_shouldStartDialogFragment() {
-        when(mFragment.getChildFragmentManager()).thenReturn(
-                mock(FragmentManager.class, Answers.RETURNS_DEEP_STUBS));
-        when(mPreference.getTitle()).thenReturn("foo");
-        mController.displayPreference(mScreen);
-
-        mController.handlePreferenceTreeClick(mPreference);
-
-        verify(mFragment).getChildFragmentManager();
-    }
-
-    public class AbstractSimStatusPreferenceControllerImpl extends
-            AbstractSimStatusPreferenceController {
-
-        public AbstractSimStatusPreferenceControllerImpl(Context context, Fragment fragment) {
-            super(context, fragment);
-        }
-
-        @Override
-        public String getPreferenceKey() {
-            return "foo";
-        }
-
-        @Override
-        protected String getPreferenceTitle() {
-            return "bar";
-        }
-
-        @Override
-        protected int getSimSlot() {
-            return 0;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDualSimPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDualSimPreferenceControllerTest.java
deleted file mode 100644
index 0845bfa..0000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDualSimPreferenceControllerTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * 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.simstatus;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.app.Fragment;
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.telephony.TelephonyManager;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import com.google.common.truth.Truth;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SimStatusDualSimPreferenceControllerTest {
-
-    @Mock
-    private Preference mPreference;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private ConnectivityManager mConnectivityManager;
-    @Mock
-    private Fragment mFragment;
-
-    private Context mContext;
-    private SimStatusDualSimPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
-        doReturn(mConnectivityManager).when(mContext).getSystemService(ConnectivityManager.class);
-        when(mUserManager.isAdminUser()).thenReturn(true);
-        when(mConnectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(
-                true);
-        mController = new SimStatusDualSimPreferenceController(mContext, mFragment);
-        ReflectionHelpers.setField(mController, "mTelephonyManager", mTelephonyManager);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
-    }
-
-    @Test
-    public void isAvailable_multiSim_shouldBeTrue() {
-        ReflectionHelpers.setField(mController, "mIsMultiSim", true);
-
-        Truth.assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_notMultiSim_shouldBeFalse() {
-        ReflectionHelpers.setField(mController, "mIsMultiSim", false);
-
-        Truth.assertThat(mController.isAvailable()).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerV2Test.java
index 3282c3c..53324b5 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerV2Test.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerV2Test.java
@@ -16,13 +16,16 @@
 
 package com.android.settings.deviceinfo.simstatus;
 
-import static com.google.common.truth.Truth.assertThat;
-
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.app.Fragment;
+import android.app.FragmentManager;
 import android.content.Context;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
@@ -31,11 +34,13 @@
 
 import com.android.settings.R;
 import com.android.settings.TestConfig;
+import com.android.settings.deviceinfo.imei.ImeiInfoPreferenceControllerV2;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
@@ -49,6 +54,8 @@
     @Mock
     private Preference mPreference;
     @Mock
+    private Preference mSecondSimPreference;
+    @Mock
     private PreferenceScreen mScreen;
     @Mock
     private TelephonyManager mTelephonyManager;
@@ -65,25 +72,60 @@
         MockitoAnnotations.initMocks(this);
         mContext = spy(RuntimeEnvironment.application);
         doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
-        mController = new SimStatusPreferenceControllerV2(mContext, mFragment);
+        mController = spy(new SimStatusPreferenceControllerV2(mContext, mFragment));
+        doReturn(true).when(mController).isAvailable();
+        when(mScreen.getContext()).thenReturn(mContext);
+        doReturn(mSecondSimPreference).when(mController).createNewPreference(mContext);
         ReflectionHelpers.setField(mController, "mTelephonyManager", mTelephonyManager);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
+        final String prefKey = mController.getPreferenceKey();
+        when(mPreference.getKey()).thenReturn(prefKey);
+        when(mPreference.isVisible()).thenReturn(true);
     }
 
     @Test
-    public void getPreferenceTitle_noMultiSim_shouldReturnSingleSimString() {
-        ReflectionHelpers.setField(mController, "mIsMultiSim", false);
+    public void displayPreference_multiSim_shouldAddSecondPreference() {
+        when(mTelephonyManager.getPhoneCount()).thenReturn(2);
 
-        assertThat(mController.getPreferenceTitle()).isEqualTo(mContext.getResources().getString(
-                R.string.sim_status_title));
+        mController.displayPreference(mScreen);
+
+        verify(mScreen).addPreference(mSecondSimPreference);
     }
 
     @Test
-    public void getPreferenceTitle_multiSim_shouldReturnMultiSimString() {
-        ReflectionHelpers.setField(mController, "mIsMultiSim", true);
+    public void updateState_singleSim_shouldSetSingleSimTitleAndSummary() {
+        when(mTelephonyManager.getPhoneCount()).thenReturn(1);
+        mController.displayPreference(mScreen);
 
-        assertThat(mController.getPreferenceTitle()).isEqualTo(mContext.getResources().getString(
-                R.string.sim_status_title_sim_slot_1));
+        mController.updateState(mPreference);
+
+        verify(mPreference).setTitle(mContext.getString(R.string.sim_status_title));
+        verify(mPreference).setSummary(anyString());
+    }
+
+    @Test
+    public void updateState_multiSim_shouldSetMultiSimTitleAndSummary() {
+        when(mTelephonyManager.getPhoneCount()).thenReturn(2);
+        mController.displayPreference(mScreen);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setTitle(
+                mContext.getString(R.string.sim_status_title_sim_slot, 1 /* sim slot */));
+        verify(mSecondSimPreference).setTitle(
+                mContext.getString(R.string.sim_status_title_sim_slot, 2 /* sim slot */));
+        verify(mPreference).setSummary(anyString());
+        verify(mSecondSimPreference).setSummary(anyString());
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_shouldStartDialogFragment() {
+        when(mFragment.getChildFragmentManager()).thenReturn(
+                mock(FragmentManager.class, Answers.RETURNS_DEEP_STUBS));
+        mController.displayPreference(mScreen);
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        verify(mFragment).getChildFragmentManager();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
index fb3e75d..548d144 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
@@ -82,7 +82,9 @@
     public void testPrepareActionBar_networkResetShouldBeCreated() {
         final NetworkResetActionMenuController resetController =
                 mock(NetworkResetActionMenuController.class);
+        final PrivateDnsMenuController privateDnsController = mock(PrivateDnsMenuController.class);
         ReflectionHelpers.setField(mFragment, "mNetworkResetController", resetController);
+        ReflectionHelpers.setField(mFragment, "mPrivateDnsMenuController", privateDnsController);
 
         mFragment.onCreateOptionsMenu(null, null);