diff --git a/keystore2/Android.bp b/keystore2/Android.bp
index b591d8c..a7aa8fc 100644
--- a/keystore2/Android.bp
+++ b/keystore2/Android.bp
@@ -48,11 +48,11 @@
         "libkeystore2_vintf_rust",
         "liblazy_static",
         "liblibc",
-        "liblibsqlite3_sys",
+        "liblibsqlite3_sys_noicu",
         "liblog_event_list",
         "liblog_rust",
         "librand",
-        "librusqlite",
+        "librusqlite_noicu",
         "librustutils",
         "libthiserror",
     ],
@@ -128,7 +128,6 @@
         "libc",
         "libdl_android",
         "libdl",
-        "libandroidicu",
         "libkeymint",
         "libkeystore2_aaid",
         "libkeystore2_apc_compat",
diff --git a/keystore2/legacykeystore/Android.bp b/keystore2/legacykeystore/Android.bp
index da6aa8a..62d593c 100644
--- a/keystore2/legacykeystore/Android.bp
+++ b/keystore2/legacykeystore/Android.bp
@@ -33,7 +33,7 @@
         "libbinder_rs",
         "libkeystore2",
         "liblog_rust",
-        "librusqlite",
+        "librusqlite_noicu",
         "librustutils",
         "libthiserror",
     ],
@@ -52,7 +52,7 @@
         "libkeystore2",
         "libkeystore2_test_utils",
         "liblog_rust",
-        "librusqlite",
+        "librusqlite_noicu",
         "librustutils",
         "libthiserror",
     ],