diff --git a/device.mk b/device.mk
index 34e981b6..a3e3ce81 100644
--- a/device.mk
+++ b/device.mk
@@ -927,6 +927,9 @@ PRODUCT_PACKAGES += \
 	libgc2_cwl \
 	libgc2_utils
 
+## Start packet router
+include device/google/gs-common/telephony/pktrouter.mk
+
 # Thermal HAL
 PRODUCT_PROPERTY_OVERRIDES += persist.vendor.enable.thermal.genl=true
 
diff --git a/sepolicy/telephony/pktrouter/device.te b/sepolicy/telephony/pktrouter/device.te
deleted file mode 100644
index 3225bac6..00000000
--- a/sepolicy/telephony/pktrouter/device.te
+++ /dev/null
@@ -1 +0,0 @@
-type pktrouter_device, dev_type;
diff --git a/sepolicy/telephony/pktrouter/file_contexts b/sepolicy/telephony/pktrouter/file_contexts
deleted file mode 100644
index f6e73dbf..00000000
--- a/sepolicy/telephony/pktrouter/file_contexts
+++ /dev/null
@@ -1,4 +0,0 @@
-# WFC
-/vendor/bin/wfc-pkt-router     u:object_r:pktrouter_exec:s0
-
-/dev/umts_wfc[01]              u:object_r:pktrouter_device:s0
diff --git a/sepolicy/telephony/pktrouter/netutils_wrapper.te b/sepolicy/telephony/pktrouter/netutils_wrapper.te
deleted file mode 100644
index ff1be58e..00000000
--- a/sepolicy/telephony/pktrouter/netutils_wrapper.te
+++ /dev/null
@@ -1,7 +0,0 @@
-allow netutils_wrapper pktrouter:fd use;
-allow netutils_wrapper pktrouter:fifo_file write;
-allow netutils_wrapper pktrouter:netlink_route_socket { read write };
-allow netutils_wrapper pktrouter:packet_socket { read write };
-allow netutils_wrapper pktrouter:rawip_socket { read write };
-allow netutils_wrapper pktrouter:udp_socket { read write };
-allow netutils_wrapper pktrouter_device:chr_file rw_file_perms;
diff --git a/sepolicy/telephony/pktrouter/pktrouter.te b/sepolicy/telephony/pktrouter/pktrouter.te
deleted file mode 100644
index b7d2e112..00000000
--- a/sepolicy/telephony/pktrouter/pktrouter.te
+++ /dev/null
@@ -1,14 +0,0 @@
-type pktrouter, domain;
-type pktrouter_exec, vendor_file_type, exec_type, file_type;
-init_daemon_domain(pktrouter)
-net_domain(pktrouter)
-
-domain_auto_trans(pktrouter, netutils_wrapper_exec, netutils_wrapper);
-
-allow pktrouter pktrouter_device:chr_file rw_file_perms;
-allow pktrouter radio_device:chr_file r_file_perms;
-allow pktrouter self:netlink_route_socket nlmsg_write;
-allow pktrouter self:packet_socket { bind create read write getattr shutdown};
-allow pktrouter self:capability net_raw;
-
-get_prop(pktrouter, vendor_ims_prop);
diff --git a/sepolicy/telephony/pktrouter/property.te b/sepolicy/telephony/pktrouter/property.te
deleted file mode 100644
index a3d6a392..00000000
--- a/sepolicy/telephony/pktrouter/property.te
+++ /dev/null
@@ -1 +0,0 @@
-vendor_internal_prop(vendor_ims_prop)
diff --git a/sepolicy/telephony/pktrouter/property_contexts b/sepolicy/telephony/pktrouter/property_contexts
deleted file mode 100644
index 4165d92c..00000000
--- a/sepolicy/telephony/pktrouter/property_contexts
+++ /dev/null
@@ -1,3 +0,0 @@
-# for ims service
-vendor.pktrouter              u:object_r:vendor_ims_prop:s0
-
diff --git a/sepolicy/telephony/pktrouter/vendor_init.te b/sepolicy/telephony/pktrouter/vendor_init.te
deleted file mode 100644
index 3a867815..00000000
--- a/sepolicy/telephony/pktrouter/vendor_init.te
+++ /dev/null
@@ -1 +0,0 @@
-set_prop(vendor_init, vendor_ims_prop)
diff --git a/telephony/pktrouter.mk b/telephony/pktrouter.mk
deleted file mode 100644
index aaa8a71a..00000000
--- a/telephony/pktrouter.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-PRODUCT_PACKAGES += wfc-pkt-router
-PRODUCT_PROPERTY_OVERRIDES += vendor.pktrouter=1
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101/sepolicy/telephony/pktrouter