diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index acb08f2..46e1cd3 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -67,6 +67,7 @@
     com.android.os.statsd \
     com.android.sdkext \
     com.android.telephony \
+    com.android.tethering \
     com.android.tzdata \
     com.android.wifi \
     ContactsProvider \
@@ -108,7 +109,6 @@
     incident_helper \
     init.environ.rc \
     init_system \
-    InProcessTethering \
     input \
     installd \
     iorapd \
@@ -334,7 +334,8 @@
     ike \
     updatable-media \
     framework-appsearch \
-    framework-wifi
+    framework-wifi \
+    framework-tethering
 
 PRODUCT_UPDATABLE_BOOT_JARS := \
     com.android.appsearch:framework-appsearch \
@@ -345,7 +346,8 @@
     com.android.sdkext:framework-sdkext \
     com.android.telephony:telephony-common \
     com.android.telephony:ims-common \
-    com.android.wifi:framework-wifi
+    com.android.wifi:framework-wifi \
+    com.android.tethering:framework-tethering
 
 PRODUCT_COPY_FILES += \
     system/core/rootdir/init.usb.rc:system/etc/init/hw/init.usb.rc \
diff --git a/target/product/go_defaults_common.mk b/target/product/go_defaults_common.mk
index c907acf..64728f0 100644
--- a/target/product/go_defaults_common.mk
+++ b/target/product/go_defaults_common.mk
@@ -40,6 +40,7 @@
 PRODUCT_PACKAGES += InProcessNetworkStack
 PRODUCT_PACKAGES += CellBroadcastAppPlatform
 PRODUCT_PACKAGES += CellBroadcastServiceModulePlatform
+PRODUCT_PACKAGES += InProcessTethering
 
 # Strip the local variable table and the local variable type table to reduce
 # the size of the system image. This has no bearing on stack traces, but will