diff --git a/Android.mk b/Android.mk
index 41a5f01..c9d5e32 100644
--- a/Android.mk
+++ b/Android.mk
@@ -51,17 +51,6 @@ LOCAL_DEX_PREOPT := false
 LOCAL_MODULE_SUFFIX := .apk
 include $(BUILD_PREBUILT)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := datastatusnotification
-LOCAL_MODULE_OWNER := motorola
-LOCAL_SRC_FILES := proprietary/app/datastatusnotification/datastatusnotification.apk
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-include $(BUILD_PREBUILT)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE := embms
 LOCAL_MODULE_OWNER := motorola
@@ -226,6 +215,16 @@ LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_MODULE_SUFFIX := .jar
 include $(BUILD_PREBUILT)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := QtiTelephonyServicelibrary
+LOCAL_MODULE_OWNER := motorola
+LOCAL_SRC_FILES := proprietary/framework/QtiTelephonyServicelibrary.jar
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE_SUFFIX := .jar
+include $(BUILD_PREBUILT)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := cneapiclient
 LOCAL_MODULE_OWNER := motorola
diff --git a/proprietary/app/datastatusnotification/datastatusnotification.apk b/proprietary/app/datastatusnotification/datastatusnotification.apk
deleted file mode 100644
index 98a1f7c..0000000
Binary files a/proprietary/app/datastatusnotification/datastatusnotification.apk and /dev/null differ
diff --git a/proprietary/framework/QtiTelephonyServicelibrary.jar b/proprietary/framework/QtiTelephonyServicelibrary.jar
new file mode 100644
index 0000000..f912d63
Binary files /dev/null and b/proprietary/framework/QtiTelephonyServicelibrary.jar differ
diff --git a/proprietary/framework/qti-telephony-common.jar b/proprietary/framework/qti-telephony-common.jar
index 89219aa..e7f81d4 100644
Binary files a/proprietary/framework/qti-telephony-common.jar and b/proprietary/framework/qti-telephony-common.jar differ
diff --git a/sanders-vendor.mk b/sanders-vendor.mk
index 670df70..4e86050 100644
--- a/sanders-vendor.mk
+++ b/sanders-vendor.mk
@@ -1290,7 +1290,6 @@ PRODUCT_COPY_FILES += \
 
 PRODUCT_PACKAGES += \
     TimeService \
-    datastatusnotification \
     embms \
     colorservice \
     com.qti.location.sdk \
@@ -1305,6 +1304,7 @@ PRODUCT_PACKAGES += \
     qcrilmsgtunnel \
     izat.xt.srv \
     qti-telephony-common \
+    QtiTelephonyServicelibrary \
     atfwd \
     cneapiclient \
     com.qti.dpmframework \