diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml
index b2cc236..9a6047c 100644
--- a/res/xml/my_device_info.xml
+++ b/res/xml/my_device_info.xml
@@ -57,7 +57,7 @@
 
     <Preference
         android:key="emergency_info"
-        android:order="4"
+        android:order="14"
         android:title="@string/emergency_info_title"
         android:summary="@string/summary_placeholder"
         settings:controller="com.android.settings.accounts.EmergencyInfoPreferenceController"/>
@@ -65,7 +65,7 @@
     <!-- Legal information -->
     <Preference
         android:key="legal_container"
-        android:order="5"
+        android:order="15"
         android:title="@string/legal_information"
         android:fragment="com.android.settings.LegalSettings"
         settings:allowDividerAbove="true"
@@ -74,7 +74,7 @@
     <!-- Regulatory labels -->
     <Preference
         android:key="regulatory_info"
-        android:order="6"
+        android:order="16"
         android:title="@string/regulatory_labels">
         <intent android:action="android.settings.SHOW_REGULATORY_INFO"/>
     </Preference>
@@ -82,7 +82,7 @@
     <!-- Safety & regulatory manual -->
     <Preference
         android:key="safety_info"
-        android:order="7"
+        android:order="17"
         android:title="@string/safety_and_regulatory_info">
         <intent android:action="android.settings.SHOW_SAFETY_AND_REGULATORY_INFO"/>
     </Preference>
@@ -90,7 +90,7 @@
     <!-- SIM status -->
     <Preference
         android:key="sim_status"
-        android:order="8"
+        android:order="18"
         android:title="@string/sim_status_title"
         settings:keywords="@string/keywords_sim_status"
         android:summary="@string/summary_placeholder"
@@ -99,7 +99,7 @@
     <!-- Model & hardware -->
     <Preference
         android:key="device_model"
-        android:order="21"
+        android:order="31"
         android:title="@string/hardware_info"
         settings:keywords="@string/keywords_model_and_hardware"
         android:summary="@string/summary_placeholder"
@@ -109,7 +109,7 @@
     <!-- IMEI -->
     <Preference
         android:key="imei_info"
-        android:order="22"
+        android:order="32"
         android:title="@string/status_imei"
         settings:keywords="@string/keywords_imei_info"
         android:summary="@string/summary_placeholder"
@@ -118,7 +118,7 @@
     <!-- Android version -->
     <Preference
         android:key="firmware_version"
-        android:order="32"
+        android:order="42"
         android:title="@string/firmware_version"
         android:summary="@string/summary_placeholder"
         android:fragment="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionSettings"
@@ -127,7 +127,7 @@
     <!--IP address -->
     <Preference
         android:key="wifi_ip_address"
-        android:order="34"
+        android:order="44"
         android:title="@string/wifi_ip_address"
         android:summary="@string/summary_placeholder"
         android:selectable="false"
@@ -137,7 +137,7 @@
     <!-- Wi-Fi MAC address -->
     <Preference
         android:key="wifi_mac_address"
-        android:order="35"
+        android:order="45"
         android:title="@string/status_wifi_mac_address"
         android:summary="@string/summary_placeholder"
         android:selectable="false"
@@ -146,7 +146,7 @@
     <!-- Bluetooth address -->
     <Preference
         android:key="bt_address"
-        android:order="36"
+        android:order="46"
         android:title="@string/status_bt_address"
         android:summary="@string/summary_placeholder"
         android:selectable="false"
@@ -155,7 +155,7 @@
     <!-- Device up time -->
     <Preference
         android:key="up_time"
-        android:order="37"
+        android:order="47"
         android:title="@string/status_up_time"
         android:summary="@string/summary_placeholder"
         android:selectable="false"/>
@@ -163,7 +163,7 @@
     <!-- Manual -->
     <Preference
         android:key="manual"
-        android:order="40"
+        android:order="50"
         android:title="@string/manual">
         <intent android:action="android.settings.SHOW_MANUAL"/>
     </Preference>
@@ -171,21 +171,21 @@
     <!-- Feedback on the device -->
     <Preference
         android:key="device_feedback"
-        android:order="41"
+        android:order="51"
         android:title="@string/device_feedback"
         settings:keywords="@string/keywords_device_feedback"/>
 
     <!-- Device FCC equipment id -->
     <Preference
         android:key="fcc_equipment_id"
-        android:order="42"
+        android:order="52"
         android:title="@string/fcc_equipment_id"
         android:summary="@string/summary_placeholder"/>
 
     <!-- Build number -->
     <Preference
         android:key="build_number"
-        android:order="43"
+        android:order="53"
         android:title="@string/build_number"
         android:summary="@string/summary_placeholder"
         settings:allowDividerAbove="true"