diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index a37b49f..b21deda 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -16,9 +16,6 @@
 include build/make/target/board/BoardConfigMainlineCommon.mk
 include build/make/target/board/BoardConfigPixelCommon.mk
 
-# Should be uncommented after fixing vndk-sp violation is fixed.
-PRODUCT_FULL_TREBLE_OVERRIDE := true
-
 # HACK : To fix up after bring up multimedia devices.
 TARGET_SOC := zumapro
 
diff --git a/device.mk b/device.mk
index 229369a..95fb930 100644
--- a/device.mk
+++ b/device.mk
@@ -219,6 +219,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	persist.sys.hdcp_checking=drm-only
 
 USE_LASSEN_OEMHOOK := true
+
+# Pixel Logger
+include hardware/google/pixel/PixelLogger/PixelLogger.mk
+
 ifneq ($(BOARD_WITHOUT_RADIO),true)
 # The "power-anomaly-sitril" is added into PRODUCT_SOONG_NAMESPACES when
 # $(USE_LASSEN_OEMHOOK) is true and $(BOARD_WITHOUT_RADIO) is not true.
@@ -274,9 +278,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.modem.extensive_logging_enabled=false
 
-# Pixel Logger
-include hardware/google/pixel/PixelLogger/PixelLogger.mk
-
 # Use Lassen specifc Shared Modem Platform
 SHARED_MODEM_PLATFORM_VENDOR := lassen