diff --git a/overlay/CertifiedKeyBoxOverlay/Android.bp b/overlay/CertifiedKeyBoxOverlay/Android.bp
deleted file mode 100644
index 5fcd9c4..0000000
--- a/overlay/CertifiedKeyBoxOverlay/Android.bp
+++ /dev/null
@@ -1,5 +0,0 @@
-runtime_resource_overlay {
-    name: "CertifiedKeyBoxOverlay",
-    sdk_version: "current",
-    system_ext_specific: true,
-}
diff --git a/overlay/CertifiedKeyBoxOverlay/AndroidManifest.xml b/overlay/CertifiedKeyBoxOverlay/AndroidManifest.xml
deleted file mode 100644
index cea16f2..0000000
--- a/overlay/CertifiedKeyBoxOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.certified.keybox.overlay">
-
-    <application android:hasCode="false" />
-    <overlay
-        android:priority="120"
-        android:enabled="true"
-        android:targetPackage="android" />
-</manifest>
diff --git a/overlay/CertifiedKeyBoxOverlay/res/values/config.xml b/overlay/CertifiedKeyBoxOverlay/res/values/config.xml
deleted file mode 100644
index 2e98457..0000000
--- a/overlay/CertifiedKeyBoxOverlay/res/values/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string-array name="custom_keybox" translatable="false">
-        <!--
-         Keybox entries for EC and RSA keys and certificates.
-         These should be populated with valid data for device certification.
-         <item>EC.PRIV:</item>
-         <item>EC.CERT_1:</item>
-         <item>EC.CERT_2:</item>
-         <item>EC.CERT_3:</item>
-         <item>RSA.PRIV:</item>
-         <item>RSA.CERT_1:</item>
-         <item>RSA.CERT_2:</item>
-         <item>RSA.CERT_3:</item>
-       -->
-        <!--<item>EC.PRIV:MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgIeCGQyoVGYRZzzY6UPwUydqt+TX1J8Lf1x5NbbxC5UShRANCAATrnnn4QmNZrMsqkUyJhsxwrZBmk4KpcyYT/qzL+CEnTCF0l0oq/qW5TX9m1OBlEGY1vFO3oKOmcVg+2z4RrhAU</item>
-        <item>EC.CERT_1:MIICeDCCAh6gAwIBAgICEAEwCgYIKoZIzj0EAwIwgZgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MRUwEwYDVQQKDAxHb29nbGUsIEluYy4xEDAOBgNVBAsMB0FuZHJvaWQxMzAxBgNVBAMMKkFuZHJvaWQgS2V5c3RvcmUgU29mdHdhcmUgQXR0ZXN0YXRpb24gUm9vdDAeFw0xNjAxMTEwMDQ2MDlaFw0yNjAxMDgwMDQ2MDlaMIGIMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEVMBMGA1UECgwMR29vZ2xlLCBJbmMuMRAwDgYDVQQLDAdBbmRyb2lkMTswOQYDVQQDDDJBbmRyb2lkIEtleXN0b3JlIFNvZnR3YXJlIEF0dGVzdGF0aW9uIEludGVybWVkaWF0ZTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABOueefhCY1msyyqRTImGzHCtkGaTgqlzJhP+rMv4ISdMIXSXSir+pblNf2bU4GUQZjW8U7ego6ZxWD7bPhGuEBSjZjBkMB0GA1UdDgQWBBQ//KzWGrE6noEguNUlHMVlux6RqTAfBgNVHSMEGDAWgBTIrel3TEXDo88NFhDkeUM6IVowzzASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIChDAKBggqhkjOPQQDAgNIADBFAiBLipt77oK8wDOHri/AiZi03cONqycqRZ9pDMfDktQPjgIhAO7aAV229DLp1IQ7YkyUBO86fMy9Xvsiu+f+uXc/WT/7</item>
-        <item>EC.CERT_2:MIICizCCAjKgAwIBAgIJAKIFntEOQ1tXMAoGCCqGSM49BAMCMIGYMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzEVMBMGA1UECgwMR29vZ2xlLCBJbmMuMRAwDgYDVQQLDAdBbmRyb2lkMTMwMQYDVQQDDCpBbmRyb2lkIEtleXN0b3JlIFNvZnR3YXJlIEF0dGVzdGF0aW9uIFJvb3QwHhcNMTYwMTExMDA0MzUwWhcNMzYwMTA2MDA0MzUwWjCBmDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDU1vdW50YWluIFZpZXcxFTATBgNVBAoMDEdvb2dsZSwgSW5jLjEQMA4GA1UECwwHQW5kcm9pZDEzMDEGA1UEAwwqQW5kcm9pZCBLZXlzdG9yZSBTb2Z0d2FyZSBBdHRlc3RhdGlvbiBSb290MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE7l1ex+HA220Dpn7mthvsTWpdamguD/9/SQ59dx9EIm29sa/6FsvHrcV30lacqrewLVQBXT5DKyqO107sSHVBpKNjMGEwHQYDVR0OBBYEFMit6XdMRcOjzw0WEOR5QzohWjDPMB8GA1UdIwQYMBaAFMit6XdMRcOjzw0WEOR5QzohWjDPMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgKEMAoGCCqGSM49BAMCA0cAMEQCIDUho++LNEYenNVg8x1YiSBq3KNlQfYNns6KGYxmSGB7AiBNC/NR2TB8fVvaNTQdqEcbY6WFZTytTySn502vQX3xvw==</item>
-        <item>EC.CERT_3:null</item>
-        <item>RSA.PRIV:MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMCDI9xWiBu4MCBp9bCFYcbuvn8F4vWoQgSKvotHvnb+rvJc8psq+jIAFBYBQpmJoV/PxoFes2NYPC/S8gvkmDKD3YFLFtfhhUF65Uq8KWo6bbXABAg7aMVWwfAjOZFkGYZNULdNQK7KSEx3NWyJWgwnWr+sSZ1dfSNi8pxeAuhxAgMBAAECgYEAvoYLC5moAqb7GllDinu3FQZbCaNtxunKzGvzwCw019eelMZgZCjYjHt/ZXfBzepkB0q+jnKG3x8IEdyXKCYIaN6V0y78lrbQhP8nGl9g3vzHA+ejjm4pupo8X8LCgHa2qJavHTTXiCjOm92x80+clARDB4EpjiATFnJbvbyZOkECQQDhxtknZGwJFuw2gm1ZSYN0DCHxsHTEoaWYZ8ZpeVyF09xGTFuSnpS/s04NzFAUsQ8TNBq3/dX2BBTSoybK1BzFAkEA2khZl3hc1WMPsP2MUlT5jlOOGJg6rp5rfmpae100N1W5IY69QDINKDh9eJ92+iGLzC2LaKX2QY+77KUXmrOvvQJAUP78MmSVWWFu1lNOFUUJMp2To9gQ2+W9uYIpLPeL2LrbgCCujVf0tx0FOG/+np2ycco0d6NJmdt2+OXs6cDUnQJAFbdM8nzO/4uza/BNnYNGsJovcNL0Q5sPJqx+A/fp0fd9S5Ff0psoI/A6y11SAOCFf/KoA+k+7pbWI1zpVEK8IQJBAJCnRdqJcLLNZJZgMkIoxfgoVv/WZbqahcjWDxuL7nF+zSxy6uAdrYa6dlTUz0WttfHysx2fgSLPpfGlVw+bLSU=</item>
-        <item>RSA.CERT_1:MIICtjCCAh+gAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwYzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDU1vdW50YWluIFZpZXcxFTATBgNVBAoMDEdvb2dsZSwgSW5jLjEQMA4GA1UECwwHQW5kcm9pZDAeFw0xNjAxMDQxMjQwNTNaFw0zNTEyMzAxMjQwNTNaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRUwEwYDVQQKDAxHb29nbGUsIEluYy4xEDAOBgNVBAsMB0FuZHJvaWQxKTAnBgNVBAMMIEFuZHJvaWQgU29mdHdhcmUgQXR0ZXN0YXRpb24gS2V5MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDAgyPcVogbuDAgafWwhWHG7r5/BeL1qEIEir6LR752/q7yXPKbKvoyABQWAUKZiaFfz8aBXrNjWDwv0vIL5Jgyg92BSxbX4YVBeuVKvClqOm21wAQIO2jFVsHwIzmRZBmGTVC3TUCuykhMdzVsiVoMJ1q/rEmdXX0jYvKcXgLocQIDAQABo2YwZDAdBgNVHQ4EFgQU1AwQG/jNY7n3OVK1DhNcpteZk4YwHwYDVR0jBBgwFoAUKfrxrMxN0kyWQCd1trDpMuUH/i4wEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAoQwDQYJKoZIhvcNAQELBQADgYEAni1IX4xnM9waha2Z11Aj6hTsQ7DhnerCI0YecrUZ3GAi5KVoMWwLVcTmnKItnzpPk2sxixZ4Fg2Iy9mLzICdhPDCJ+NrOPH90ecXcjFZNX2W88V/q52PlmEmT7K+gbsNSQQiis6f9/VCLiVE+iEHElqDtVWtGIL4QBSbnCBjBH8=</item>
-        <item>RSA.CERT_2:MIICpzCCAhCgAwIBAgIJAP+U2d2fB8gMMA0GCSqGSIb3DQEBCwUAMGMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MRUwEwYDVQQKDAxHb29nbGUsIEluYy4xEDAOBgNVBAsMB0FuZHJvaWQwHhcNMTYwMTA0MTIzMTA4WhcNMzUxMjMwMTIzMTA4WjBjMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzEVMBMGA1UECgwMR29vZ2xlLCBJbmMuMRAwDgYDVQQLDAdBbmRyb2lkMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCia63rbi5EYe/VDoLmt5TRdSMfd5tjkWP/96r/C3JHTsAsQ+wzfNes7UA+jCigZtX3hwszl94OuE4TQKuvpSe/lWmgMdsGUmX4RFlXYfC78hdLt0GAZMAoDo9Sd47b0ke2RekZyOmLw9vCkT/X11DEHTVm+Vfkl5YLCazOkjWFmwIDAQABo2MwYTAdBgNVHQ4EFgQUKfrxrMxN0kyWQCd1trDpMuUH/i4wHwYDVR0jBBgwFoAUKfrxrMxN0kyWQCd1trDpMuUH/i4wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAoQwDQYJKoZIhvcNAQELBQADgYEAT3LzNlmNDsG5dFsxWfbwjSVJMJ6jHBwp0kUtILlNX2S06IDHeHqcOd6os/W/L3BfRxBcxebrTQaZYdKumgf/93y4q+ucDyQHXrF/unlx/U1bnt8Uqf7f7XzAiF343ZtkMlbVNZriE/mPzsF83O+kqrJVw4OpLvtc9mL1J1IXvmM=</item>
-        <item>RSA.CERT_3:null</item>-->
-    </string-array>
-
-</resources>
\ No newline at end of file
diff --git a/overlay/CertifiedPropOverlay/AndroidManifest.xml b/overlay/CertifiedPropOverlay/AndroidManifest.xml
index f86c680..30dff9c 100644
--- a/overlay/CertifiedPropOverlay/AndroidManifest.xml
+++ b/overlay/CertifiedPropOverlay/AndroidManifest.xml
@@ -3,7 +3,7 @@
 
     <application android:hasCode="false" />
     <overlay
+        android:isStatic="true"
         android:priority="100"
-        android:enabled="true"
         android:targetPackage="android" />
 </manifest>
diff --git a/overlay/CertifiedPropOverlay/res/values/config.xml b/overlay/CertifiedPropOverlay/res/values/config.xml
index 197335d..6ee9f81 100644
--- a/overlay/CertifiedPropOverlay/res/values/config.xml
+++ b/overlay/CertifiedPropOverlay/res/values/config.xml
@@ -31,4 +31,27 @@
         <item>VERSION.SECURITY_PATCH:2025-02-05</item>
         <item>VERSION.DEVICE_INITIAL_SDK_INT:21</item>-->
     </string-array>
+
+    <string-array name="custom_keybox" translatable="false">
+        <!--
+         Keybox entries for EC and RSA keys and certificates.
+         These should be populated with valid data for device certification.
+         <item>EC.PRIV:</item>
+         <item>EC.CERT_1:</item>
+         <item>EC.CERT_2:</item>
+         <item>EC.CERT_3:</item>
+         <item>RSA.PRIV:</item>
+         <item>RSA.CERT_1:</item>
+         <item>RSA.CERT_2:</item>
+         <item>RSA.CERT_3:</item>
+       -->
+        <!--<item>EC.PRIV:MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgIeCGQyoVGYRZzzY6UPwUydqt+TX1J8Lf1x5NbbxC5UShRANCAATrnnn4QmNZrMsqkUyJhsxwrZBmk4KpcyYT/qzL+CEnTCF0l0oq/qW5TX9m1OBlEGY1vFO3oKOmcVg+2z4RrhAU</item>
+        <item>EC.CERT_1:MIICeDCCAh6gAwIBAgICEAEwCgYIKoZIzj0EAwIwgZgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MRUwEwYDVQQKDAxHb29nbGUsIEluYy4xEDAOBgNVBAsMB0FuZHJvaWQxMzAxBgNVBAMMKkFuZHJvaWQgS2V5c3RvcmUgU29mdHdhcmUgQXR0ZXN0YXRpb24gUm9vdDAeFw0xNjAxMTEwMDQ2MDlaFw0yNjAxMDgwMDQ2MDlaMIGIMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEVMBMGA1UECgwMR29vZ2xlLCBJbmMuMRAwDgYDVQQLDAdBbmRyb2lkMTswOQYDVQQDDDJBbmRyb2lkIEtleXN0b3JlIFNvZnR3YXJlIEF0dGVzdGF0aW9uIEludGVybWVkaWF0ZTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABOueefhCY1msyyqRTImGzHCtkGaTgqlzJhP+rMv4ISdMIXSXSir+pblNf2bU4GUQZjW8U7ego6ZxWD7bPhGuEBSjZjBkMB0GA1UdDgQWBBQ//KzWGrE6noEguNUlHMVlux6RqTAfBgNVHSMEGDAWgBTIrel3TEXDo88NFhDkeUM6IVowzzASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIChDAKBggqhkjOPQQDAgNIADBFAiBLipt77oK8wDOHri/AiZi03cONqycqRZ9pDMfDktQPjgIhAO7aAV229DLp1IQ7YkyUBO86fMy9Xvsiu+f+uXc/WT/7</item>
+        <item>EC.CERT_2:MIICizCCAjKgAwIBAgIJAKIFntEOQ1tXMAoGCCqGSM49BAMCMIGYMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzEVMBMGA1UECgwMR29vZ2xlLCBJbmMuMRAwDgYDVQQLDAdBbmRyb2lkMTMwMQYDVQQDDCpBbmRyb2lkIEtleXN0b3JlIFNvZnR3YXJlIEF0dGVzdGF0aW9uIFJvb3QwHhcNMTYwMTExMDA0MzUwWhcNMzYwMTA2MDA0MzUwWjCBmDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDU1vdW50YWluIFZpZXcxFTATBgNVBAoMDEdvb2dsZSwgSW5jLjEQMA4GA1UECwwHQW5kcm9pZDEzMDEGA1UEAwwqQW5kcm9pZCBLZXlzdG9yZSBTb2Z0d2FyZSBBdHRlc3RhdGlvbiBSb290MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE7l1ex+HA220Dpn7mthvsTWpdamguD/9/SQ59dx9EIm29sa/6FsvHrcV30lacqrewLVQBXT5DKyqO107sSHVBpKNjMGEwHQYDVR0OBBYEFMit6XdMRcOjzw0WEOR5QzohWjDPMB8GA1UdIwQYMBaAFMit6XdMRcOjzw0WEOR5QzohWjDPMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgKEMAoGCCqGSM49BAMCA0cAMEQCIDUho++LNEYenNVg8x1YiSBq3KNlQfYNns6KGYxmSGB7AiBNC/NR2TB8fVvaNTQdqEcbY6WFZTytTySn502vQX3xvw==</item>
+        <item>EC.CERT_3:null</item>
+        <item>RSA.PRIV:MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMCDI9xWiBu4MCBp9bCFYcbuvn8F4vWoQgSKvotHvnb+rvJc8psq+jIAFBYBQpmJoV/PxoFes2NYPC/S8gvkmDKD3YFLFtfhhUF65Uq8KWo6bbXABAg7aMVWwfAjOZFkGYZNULdNQK7KSEx3NWyJWgwnWr+sSZ1dfSNi8pxeAuhxAgMBAAECgYEAvoYLC5moAqb7GllDinu3FQZbCaNtxunKzGvzwCw019eelMZgZCjYjHt/ZXfBzepkB0q+jnKG3x8IEdyXKCYIaN6V0y78lrbQhP8nGl9g3vzHA+ejjm4pupo8X8LCgHa2qJavHTTXiCjOm92x80+clARDB4EpjiATFnJbvbyZOkECQQDhxtknZGwJFuw2gm1ZSYN0DCHxsHTEoaWYZ8ZpeVyF09xGTFuSnpS/s04NzFAUsQ8TNBq3/dX2BBTSoybK1BzFAkEA2khZl3hc1WMPsP2MUlT5jlOOGJg6rp5rfmpae100N1W5IY69QDINKDh9eJ92+iGLzC2LaKX2QY+77KUXmrOvvQJAUP78MmSVWWFu1lNOFUUJMp2To9gQ2+W9uYIpLPeL2LrbgCCujVf0tx0FOG/+np2ycco0d6NJmdt2+OXs6cDUnQJAFbdM8nzO/4uza/BNnYNGsJovcNL0Q5sPJqx+A/fp0fd9S5Ff0psoI/A6y11SAOCFf/KoA+k+7pbWI1zpVEK8IQJBAJCnRdqJcLLNZJZgMkIoxfgoVv/WZbqahcjWDxuL7nF+zSxy6uAdrYa6dlTUz0WttfHysx2fgSLPpfGlVw+bLSU=</item>
+        <item>RSA.CERT_1:MIICtjCCAh+gAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwYzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDU1vdW50YWluIFZpZXcxFTATBgNVBAoMDEdvb2dsZSwgSW5jLjEQMA4GA1UECwwHQW5kcm9pZDAeFw0xNjAxMDQxMjQwNTNaFw0zNTEyMzAxMjQwNTNaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRUwEwYDVQQKDAxHb29nbGUsIEluYy4xEDAOBgNVBAsMB0FuZHJvaWQxKTAnBgNVBAMMIEFuZHJvaWQgU29mdHdhcmUgQXR0ZXN0YXRpb24gS2V5MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDAgyPcVogbuDAgafWwhWHG7r5/BeL1qEIEir6LR752/q7yXPKbKvoyABQWAUKZiaFfz8aBXrNjWDwv0vIL5Jgyg92BSxbX4YVBeuVKvClqOm21wAQIO2jFVsHwIzmRZBmGTVC3TUCuykhMdzVsiVoMJ1q/rEmdXX0jYvKcXgLocQIDAQABo2YwZDAdBgNVHQ4EFgQU1AwQG/jNY7n3OVK1DhNcpteZk4YwHwYDVR0jBBgwFoAUKfrxrMxN0kyWQCd1trDpMuUH/i4wEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAoQwDQYJKoZIhvcNAQELBQADgYEAni1IX4xnM9waha2Z11Aj6hTsQ7DhnerCI0YecrUZ3GAi5KVoMWwLVcTmnKItnzpPk2sxixZ4Fg2Iy9mLzICdhPDCJ+NrOPH90ecXcjFZNX2W88V/q52PlmEmT7K+gbsNSQQiis6f9/VCLiVE+iEHElqDtVWtGIL4QBSbnCBjBH8=</item>
+        <item>RSA.CERT_2:MIICpzCCAhCgAwIBAgIJAP+U2d2fB8gMMA0GCSqGSIb3DQEBCwUAMGMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MRUwEwYDVQQKDAxHb29nbGUsIEluYy4xEDAOBgNVBAsMB0FuZHJvaWQwHhcNMTYwMTA0MTIzMTA4WhcNMzUxMjMwMTIzMTA4WjBjMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzEVMBMGA1UECgwMR29vZ2xlLCBJbmMuMRAwDgYDVQQLDAdBbmRyb2lkMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCia63rbi5EYe/VDoLmt5TRdSMfd5tjkWP/96r/C3JHTsAsQ+wzfNes7UA+jCigZtX3hwszl94OuE4TQKuvpSe/lWmgMdsGUmX4RFlXYfC78hdLt0GAZMAoDo9Sd47b0ke2RekZyOmLw9vCkT/X11DEHTVm+Vfkl5YLCazOkjWFmwIDAQABo2MwYTAdBgNVHQ4EFgQUKfrxrMxN0kyWQCd1trDpMuUH/i4wHwYDVR0jBBgwFoAUKfrxrMxN0kyWQCd1trDpMuUH/i4wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAoQwDQYJKoZIhvcNAQELBQADgYEAT3LzNlmNDsG5dFsxWfbwjSVJMJ6jHBwp0kUtILlNX2S06IDHeHqcOd6os/W/L3BfRxBcxebrTQaZYdKumgf/93y4q+ucDyQHXrF/unlx/U1bnt8Uqf7f7XzAiF343ZtkMlbVNZriE/mPzsF83O+kqrJVw4OpLvtc9mL1J1IXvmM=</item>
+        <item>RSA.CERT_3:null</item>-->
+    </string-array>
 </resources>
\ No newline at end of file
diff --git a/overlay/overlay.mk b/overlay/overlay.mk
index 19413b1..06ef013 100644
--- a/overlay/overlay.mk
+++ b/overlay/overlay.mk
@@ -1,5 +1,4 @@
 PRODUCT_PACKAGES += \
     FontWenkaiOverlay \
     FontWkmonoOverlay \
-    CertifiedPropOverlay \
-    CertifiedKeyBoxOverlay
\ No newline at end of file
+    CertifiedPropOverlay