diff --git a/Android.bp b/Android.bp
index 71a9b8a..d6c3848 100644
--- a/Android.bp
+++ b/Android.bp
@@ -132,17 +132,7 @@ android_app_import {
 }
 
 android_app_import {
-	name: "imssettings",
-	owner: "motorola",
-	apk: "proprietary/app/imssettings/imssettings.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-}
-
-android_app_import {
-	name: "WfdService",
+	name: "TimeService",
 	owner: "motorola",
 	apk: "proprietary/priv-app/WfdService/WfdService.apk",
 	certificate: "platform",
@@ -174,6 +164,12 @@ android_app_import {
 	privileged: true,
 }
 
+dex_import {
+	name: "WfdCommon",
+	owner: "motorola",
+	jars: ["proprietary/framework/WfdCommon.jar"],
+}
+
 dex_import {
 	name: "com.fingerprints.extension",
 	owner: "motorola",
diff --git a/sanders-vendor.mk b/sanders-vendor.mk
index 80a5c0d..c15f9a7 100644
--- a/sanders-vendor.mk
+++ b/sanders-vendor.mk
@@ -1454,6 +1454,9 @@ PRODUCT_PACKAGES += \
     DTVPlayer \
     DTVService \
     QtiTelephonyService \
+    CNEService \
+    WfdService \
+    atfwd \
     TimeService \
     embms \
     ims \
@@ -1461,4 +1464,5 @@ PRODUCT_PACKAGES += \
     WfdService \
     atfwd \
     qcrilmsgtunnel \
+    WfdCommon \
     com.fingerprints.extension