diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 12f3d37..12e58a3 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -174,7 +174,7 @@ BOARD_HARDWARE_CLASS += \
 TARGET_PER_MGR_ENABLED := true
 
 # Power
-TARGET_POWERHAL_VARIANT := qcom
+TARGET_HAS_NO_WIFI_STATS := true
 
 # Properties
 TARGET_SYSTEM_PROP += $(VENDOR_PATH)/system.prop
diff --git a/msm8976.mk b/msm8976.mk
index 4553e9d..6947e16 100644
--- a/msm8976.mk
+++ b/msm8976.mk
@@ -235,9 +235,7 @@ PRODUCT_PACKAGES += \
 
 # Power
 PRODUCT_PACKAGES += \
-    android.hardware.power@1.0-impl \
-    android.hardware.power@1.0-service \
-    power.msm8952
+    android.hardware.power@1.0-service-qti
 
 # Qualcomm dependencies
 PRODUCT_PACKAGES += \