diff --git a/res/xml/device_info_settings_v2.xml b/res/xml/device_info_settings_v2.xml
index 2edfdce8fbb..5957c1adca2 100644
--- a/res/xml/device_info_settings_v2.xml
+++ b/res/xml/device_info_settings_v2.xml
@@ -69,20 +69,20 @@
 
     <!--IP address -->
     <Preference
-        android:key="ip_address"
+        android:key="wifi_ip_address"
         android:title="@string/wifi_ip_address"
         android:summary="@string/summary_placeholder"
         settings:allowDividerAbove="true"/>
 
     <!-- Wi-Fi MAC address -->
     <Preference
-        android:key="mac_address"
+        android:key="wifi_mac_address"
         android:title="@string/status_wifi_mac_address"
         android:summary="@string/summary_placeholder"/>
 
     <!-- Bluetooth address -->
     <Preference
-        android:key="bluetooth_address"
+        android:key="bt_address"
         android:title="@string/status_bt_address"
         android:summary="@string/summary_placeholder"/>
 
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index c20b5e764c9..94cee1c8885 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -27,11 +27,14 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.dashboard.SummaryLoader;
 import com.android.settings.deviceinfo.BasebandVersionPreferenceController;
+import com.android.settings.deviceinfo.BluetoothAddressPreferenceController;
 import com.android.settings.deviceinfo.BuildNumberPreferenceController;
 import com.android.settings.deviceinfo.DeviceModelPreferenceController;
 import com.android.settings.deviceinfo.FccEquipmentIdPreferenceController;
 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;
@@ -140,11 +143,11 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable {
 
             // Android version
 
-            // IP address
+            controllers.add(new IpAddressPreferenceController(context, lifecycle));
 
-            // Wifi MAC address
+            controllers.add(new WifiMacAddressPreferenceController(context, lifecycle));
 
-            // Bluetooth Address
+            controllers.add(new BluetoothAddressPreferenceController(context, lifecycle));
 
             controllers.add(new RegulatoryInfoPreferenceController(context));