diff --git a/device.mk b/device.mk
index d56d0581..df0f60fe 100644
--- a/device.mk
+++ b/device.mk
@@ -366,7 +366,6 @@ endif
 # CP Logging properties
 PRODUCT_PROPERTY_OVERRIDES += \
 	ro.vendor.sys.modem.logging.loc = /data/vendor/slog \
-	persist.vendor.sys.silentlog.tcp = "On" \
 	ro.vendor.cbd.modem_removable = "1" \
 	ro.vendor.cbd.modem_type = "s5100sit" \
 	persist.vendor.sys.modem.logging.br_num=5 \
diff --git a/powerstats/Gs201CommonDataProviders.cpp b/powerstats/Gs201CommonDataProviders.cpp
index a6f08722..e361fc56 100644
--- a/powerstats/Gs201CommonDataProviders.cpp
+++ b/powerstats/Gs201CommonDataProviders.cpp
@@ -104,6 +104,8 @@ void addPlaceholderEnergyConsumers(std::shared_ptr<PowerStats> p) {
 void addAoC(std::shared_ptr<PowerStats> p) {
     // When the given timeout is 0, the timeout will be replaced with "120ms * statesCount".
     static const uint64_t TIMEOUT_MILLIS = 0;
+    // AoC clock is synced from "libaoc.c"
+    static const uint64_t AOC_CLOCK = 24576;
     std::string prefix = "/sys/devices/platform/19000000.aoc/control/";
 
     // Add AoC cores (a32, ff1, hf0, and hf1)
@@ -116,7 +118,7 @@ void addAoC(std::shared_ptr<PowerStats> p) {
     std::vector<std::pair<std::string, std::string>> coreStates = {
             {"DWN", "off"}, {"RET", "retention"}, {"WFI", "wfi"}};
     p->addStateResidencyDataProvider(std::make_unique<AocTimedStateResidencyDataProvider>(coreIds,
-            coreStates, TIMEOUT_MILLIS));
+            coreStates, TIMEOUT_MILLIS, AOC_CLOCK));
 
     // Add AoC voltage stats
     std::vector<std::pair<std::string, std::string>> voltageIds = {
@@ -128,7 +130,7 @@ void addAoC(std::shared_ptr<PowerStats> p) {
                                                                       {"UD", "underdrive"}};
     p->addStateResidencyDataProvider(
             std::make_unique<AocTimedStateResidencyDataProvider>(voltageIds, voltageStates,
-                    TIMEOUT_MILLIS));
+                    TIMEOUT_MILLIS, AOC_CLOCK));
 
     // Add AoC monitor mode
     std::vector<std::pair<std::string, std::string>> monitorIds = {
@@ -139,7 +141,7 @@ void addAoC(std::shared_ptr<PowerStats> p) {
     };
     p->addStateResidencyDataProvider(
             std::make_unique<AocTimedStateResidencyDataProvider>(monitorIds, monitorStates,
-                    TIMEOUT_MILLIS));
+                    TIMEOUT_MILLIS, AOC_CLOCK));
 
     // Add AoC restart count
     const GenericStateResidencyDataProvider::StateResidencyConfig restartCountConfig = {