diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index 60c1f2b871..e4ce615321 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -33,6 +33,7 @@ java_defaults {
         "NetworkStackApiStableShims",
         "androidx.annotation_annotation",
         "modules-utils-build",
+        "modules-utils-statemachine",
         "networkstack-client",
         "android.hardware.tetheroffload.config-V1.0-java",
         "android.hardware.tetheroffload.control-V1.0-java",
diff --git a/service/Android.bp b/service/Android.bp
index 911d67fc10..3ff7a7c23d 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -67,7 +67,8 @@ java_library {
     static_libs: [
         "dnsresolver_aidl_interface-V9-java",
         "modules-utils-build",
-        "modules-utils-os",
+        "modules-utils-shell-command-handler",
+        "modules-utils-statemachine",
         "net-utils-device-common",
         "net-utils-device-common-netlink",
         "net-utils-framework-common",