diff --git a/BoardConfig.mk b/BoardConfig.mk
index f7526f87117831dbf670a2813a82d7eb502f75d7..ec3c03fb6d2f6b27f436dd87c5bdc444eaea9b22 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -188,7 +188,7 @@ BOARD_FLASH_BLOCK_SIZE := 131072 # (BOARD_KERNEL_PAGESIZE * 64)
 TARGET_PER_MGR_ENABLED := true
 
 # Power
-TARGET_POWERHAL_VARIANT := qcom
+TARGET_HAS_NO_WIFI_STATS := true
 
 # Properties
 TARGET_SYSTEM_PROP := $(DEVICE_PATH)/system.prop
diff --git a/device.mk b/device.mk
index fdfff6707b9ad9d2e2997377ccc177569b1ce4ef..7ade7ac6c0520507e06f022809b1640caecd7cbe 100644
--- a/device.mk
+++ b/device.mk
@@ -272,8 +272,7 @@ PRODUCT_PACKAGES += \
 
 # Power
 PRODUCT_PACKAGES += \
-    android.hardware.power@1.0-impl \
-    power.msm8953
+    android.hardware.power@1.0-service-qti
 
 # QMI
 PRODUCT_PACKAGES += \