diff --git a/service/Android.bp b/service/Android.bp
index d1a9004..975dcb5 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -155,6 +155,11 @@
     apex_available: [
         "com.android.tethering",
     ],
+    optimize: {
+        enabled: true,
+        shrink: true,
+        proguard_flags_files: ["proguard.flags"],
+    },
     lint: { strict_updatability_linting: true },
 }
 
diff --git a/service/proguard.flags b/service/proguard.flags
new file mode 100644
index 0000000..b572684
--- /dev/null
+++ b/service/proguard.flags
@@ -0,0 +1,5 @@
+# Make sure proguard keeps all connectivity classes
+-keep class com.android.connectivity.** { *; }
+-keep class com.android.net.** { *; }
+-keep class com.android.server.** { *; }
+