diff --git a/res/xml/network_provider_settings.xml b/res/xml/network_provider_settings.xml
index b29755bab82..3d4ce800dc0 100644
--- a/res/xml/network_provider_settings.xml
+++ b/res/xml/network_provider_settings.xml
@@ -25,16 +25,14 @@
         android:key="resetting_your_internet"
         android:title="@string/resetting_internet_text"
         android:selectable="false"
-        android:layout="@layout/resetting_internet"
-        settings:allowDividerBelow="true"/>
+        android:layout="@layout/resetting_internet"/>
 
     <!-- Airplane mode message -->
     <com.android.settingslib.widget.LayoutPreference
         android:key="airplane_mode_message"
         android:title="@string/condition_airplane_title"
         android:selectable="false"
-        android:layout="@layout/airplane_mode_message_preference"
-        settings:allowDividerBelow="true"/>
+        android:layout="@layout/airplane_mode_message_preference"/>
 
     <Preference
         android:key="connected_ethernet_network"
@@ -64,14 +62,12 @@
         android:key="wifi_switch"
         android:title="@string/wifi"
         android:summary="@string/wifi_switch_summary"
-        settings:allowDividerAbove="true"
         settings:keywords="@string/keywords_wifi"/>
 
     <Preference
         android:key="configure_wifi_settings"
         android:title="@string/network_and_internet_preferences_title"
         android:summary="@string/network_and_internet_preferences_summary"
-        settings:allowDividerAbove="true"
         android:fragment="com.android.settings.wifi.ConfigureWifiSettings"/>
 
     <Preference
diff --git a/res/xml/wifi_network_details_fragment2.xml b/res/xml/wifi_network_details_fragment2.xml
index 7847eba61b1..1c4fe9147a3 100644
--- a/res/xml/wifi_network_details_fragment2.xml
+++ b/res/xml/wifi_network_details_fragment2.xml
@@ -22,8 +22,7 @@
         android:key="connection_header"
         android:layout="@layout/settings_entity_header"
         android:selectable="false"
-        android:order="-10000"
-        settings:allowDividerBelow="true"/>
+        android:order="-10000"/>
 
     <com.android.settings.datausage.DataUsageSummaryPreference
         android:key="status_header"
@@ -34,21 +33,18 @@
     <com.android.settings.widget.LinkifySummaryPreference
         android:key="second_summary"
         android:icon="@drawable/ic_info_outline_24dp"
-        android:selectable="false"
-        settings:allowDividerAbove="false"/>
+        android:selectable="false"/>
 
     <!-- Buttons -->
     <com.android.settingslib.widget.ActionButtonsPreference
         android:key="buttons"
-        android:selectable="false"
-        settings:allowDividerAbove="true"/>
+        android:selectable="false"/>
 
     <!-- General Details Preferences -->
     <Preference
         android:key="signal_strength"
         android:title="@string/wifi_signal"
-        android:selectable="false"
-        settings:allowDividerAbove="true"/>
+        android:selectable="false"/>
 
     <Preference
         android:key="frequency"
@@ -79,21 +75,18 @@
     <Preference
         android:key="subscription_detail"
         android:title="@string/wifi_subscription"
-        android:summary="@string/wifi_subscription_summary"
-        settings:allowDividerAbove="true"/>
+        android:summary="@string/wifi_subscription_summary"/>
 
     <SwitchPreference
         android:key="auto_connect"
         android:title="@string/wifi_auto_connect_title"
-        android:summary="@string/wifi_auto_connect_summary"
-        settings:allowDividerAbove="true"/>
+        android:summary="@string/wifi_auto_connect_summary"/>
 
     <!-- Add device Preference -->
     <Preference
         android:key="add_device_to_network"
         android:title="@string/wifi_dpp_add_device"
-        android:summary="@string/wifi_dpp_connect_network_using_qr_code"
-        settings:allowDividerAbove="true"/>
+        android:summary="@string/wifi_dpp_connect_network_using_qr_code"/>
 
     <!-- Network Details -->
     <PreferenceCategory