diff --git a/res/values/resurrection_device_maintainers_strings.xml b/res/values/resurrection_device_maintainers_strings.xml
index 0d32a32ee146..cfb805ddae25 100644
--- a/res/values/resurrection_device_maintainers_strings.xml
+++ b/res/values/resurrection_device_maintainers_strings.xml
@@ -49,15 +49,27 @@
    
   <string name="device_genericarm64aonly" translatable="false">Generic System Image</string>
   <string name="device_genericarm64aonly_codename" translatable="false">ARM64 A-Only</string>
-  <string name="device_genericarm64aonly_maintainer" translatable="false"></string>
+  <string name="device_genericarm64aonly_maintainer" translatable="false">RobotHanzo</string>
 
   <string name="device_genericarm64ab" translatable="false">Generic System Image</string>
   <string name="device_genericarm64ab_codename" translatable="false">ARM64 AB</string>
-  <string name="device_genericarm64ab_maintainer" translatable="false"></string>
+  <string name="device_genericarm64ab_maintainer" translatable="false">RobotHanzo</string>
  
   <string name="device_genericarmaonly" translatable="false">Generic System Image</string>
   <string name="device_genericarmaonly_codename" translatable="false">ARM A-Only</string>
-  <string name="device_genericarmaonly_maintainer" translatable="false"></string>
+  <string name="device_genericarmaonly_maintainer" translatable="false">RobotHanzo</string>
+   
+  <string name="device_genericarmab" translatable="false">Generic System Image</string>
+  <string name="device_genericarmab_codename" translatable="false">ARM AB</string>
+  <string name="device_genericarmab_maintainer" translatable="false">RobotHanzo</string>
+   
+  <string name="device_generica64aonly" translatable="false">Generic System Image</string>
+  <string name="device_generica64aonly_codename" translatable="false">ARM32 with 64-bit Binder A-Only</string>
+  <string name="device_generica64aonly_maintainer" translatable="false">RobotHanzo</string>
+
+  <string name="device_generica64ab" translatable="false">Generic System Image</string>
+  <string name="device_generica64ab_codename" translatable="false">ARM32 with 64-bit Binder AB</string>
+  <string name="device_generica64ab_maintainer" translatable="false">RobotHanzo</string>
 
   <string name="device_generichkirin" translatable="false">Generic System Image</string>
   <string name="device_generichkirin_codename" translatable="false">Huawei Kirin</string>
diff --git a/res/xml/device_maintainers_fragment.xml b/res/xml/device_maintainers_fragment.xml
index b78db0061d6f..58f314f42908 100644
--- a/res/xml/device_maintainers_fragment.xml
+++ b/res/xml/device_maintainers_fragment.xml
@@ -30,6 +30,24 @@
             app:codename="@string/device_genericarmaonly_codename"
             app:maintainer="@string/device_genericarmaonly_maintainer"
             app:type="phone" />
+	<com.android.settings.rr.Preferences.DevicePreference
+            android:id="@+id/device_genericarmab"
+            android:title="@string/device_genericarmab"
+            app:codename="@string/device_genericarmab_codename"
+            app:maintainer="@string/device_genericarmab_maintainer"
+            app:type="phone" />
+	<com.android.settings.rr.Preferences.DevicePreference
+            android:id="@+id/device_generica64aonly"
+            android:title="@string/device_generica64aonly"
+            app:codename="@string/device_genericar64only_codename"
+            app:maintainer="@string/device_generica64aonly_maintainer"
+            app:type="phone" />
+	<com.android.settings.rr.Preferences.DevicePreference
+            android:id="@+id/device_generica64ab"
+            android:title="@string/device_generica64ab"
+            app:codename="@string/device_generica64ab_codename"
+            app:maintainer="@string/device_generica64ab_maintainer"
+            app:type="phone" />
         <com.android.settings.rr.Preferences.DevicePreference
             android:id="@+id/device_generichkirin"
             android:title="@string/device_generichkirin"