diff --git a/proprietary-files.txt b/proprietary-files.txt
index c08e5898982d8de54dd8ceba53c338f30a23e6df..44196e20f616a77304b6c31b634efc06477764ca 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1190,7 +1190,7 @@ vendor/bin/thermal-engine
 -vendor/lib64/libthermalclient.so
 
 # Time services
--vendor/app/TimeService/TimeService.apk
+-vendor/app/TimeService/TimeService.apk;:timeservice_app_cert-legacy-um
 vendor/bin/time_daemon
 vendor/etc/init/init.time_daemon.rc
 -vendor/lib/libtime_genoff.so
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 65817ee9fff4bb35fbc55e4a6231a9154f7932de..e899046a0597291b52fa4569d0c106d614157681 100755
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -416,9 +416,6 @@ on post-fs-data
     #Create dir for TUI
     mkdir /data/vendor/tui 0700 system drmrpc
 
-    #Start move time data to /data/vendor once post-fs-data done
-    start vendor.move_time_data
-
 service nqnfcinfo /system/vendor/bin/nqnfcinfo
     class late_start
     group nfc
@@ -1043,13 +1040,6 @@ service vendor.power_off_alarm /vendor/bin/power_off_alarm
     disabled
     oneshot
 
-service vendor.move_time_data /system/bin/move_time_data.sh
-    class main
-    user system
-    group system
-    disabled
-    oneshot
-
 #service vendor.hbtp /vendor/bin/hbtp_daemon
 #     class main
 #     user system
diff --git a/sepolicy/vendor/genfs_contexts b/sepolicy/vendor/genfs_contexts
index 1494bb2a84aa5ce239570f1d8ab8fef69dcad7dc..1bda78922c8e1e178c496dcae62b4af6a7a7b2bd 100644
--- a/sepolicy/vendor/genfs_contexts
+++ b/sepolicy/vendor/genfs_contexts
@@ -1,2 +1,2 @@
 # Real-time clock
-genfscon sysfs /devices/soc/qpnp-rtc-8/rtc                              u:object_r:sysfs_rtc:s0
+genfscon sysfs /devices/platform/soc/200f000.qcom,spmi/spmi-0/spmi0-00/200f000.qcom,spmi:qcom,pm8953@0:qcom,pm8953_rtc/rtc/                              u:object_r:sysfs_rtc:s0