diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 5038d378..f0a226a8 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -32,7 +32,9 @@ TARGET_CPU_ABI := arm64-v8a
 TARGET_CPU_VARIANT := cortex-a55
 TARGET_CPU_VARIANT_RUNTIME := cortex-a55
 
-ifeq (,$(filter %tangor tangor% %_64,$(TARGET_PRODUCT)))
+DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false)
+
+ifneq ($(DEVICE_IS_64BIT_ONLY),true)
 TARGET_2ND_ARCH := arm
 TARGET_2ND_ARCH_VARIANT := armv8-a
 TARGET_2ND_CPU_ABI := armeabi-v7a
diff --git a/aosp_common.mk b/aosp_common.mk
index 57d67225..5ba98821 100644
--- a/aosp_common.mk
+++ b/aosp_common.mk
@@ -17,10 +17,12 @@
 #
 # All components inherited here go to system image
 #
-ifeq (,$(filter %tangor tangor% %_64,$(TARGET_PRODUCT)))
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-else
+DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false)
+
+ifeq ($(DEVICE_IS_64BIT_ONLY),true)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
+else
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 endif
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index 1a9859c6..4859d711 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -580,9 +580,9 @@ on fs
     chown system system /sys/class/dqe0/atc/gain_limit
     chown system system /sys/class/dqe0/atc/lt_calc_ab_shift
     chown system system /sys/devices/platform/1c300000.drmdecon/early_wakeup
-    chmod 0220 /sys/devices/platform/1c300000.drmdecon/early_wakeup
+    chmod 0660 /sys/devices/platform/1c300000.drmdecon/early_wakeup
     chown system system /sys/devices/platform/1c302000.drmdecon/early_wakeup
-    chmod 0220 /sys/devices/platform/1c302000.drmdecon/early_wakeup
+    chmod 0660 /sys/devices/platform/1c302000.drmdecon/early_wakeup
 
 # Copy DRM Key
 #    copy /system/app/wv.keys /factory/wv.keys
diff --git a/device.mk b/device.mk
index 9c7e6713..c3123b5a 100644
--- a/device.mk
+++ b/device.mk
@@ -17,8 +17,9 @@
 include device/google/gs-common/device.mk
 
 TARGET_BOARD_PLATFORM := gs101
+DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false)
 
-ifneq (,$(filter %tangor tangor% %_64,$(TARGET_PRODUCT)))
+ifeq ($(DEVICE_IS_64BIT_ONLY),true)
 LOCAL_64ONLY := _64
 endif
 
@@ -903,10 +904,10 @@ ifneq ($(BOARD_WITHOUT_RADIO),true)
 $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk)
 endif
 
-ifeq (,$(filter %tangor tangor% %_64,$(TARGET_PRODUCT)))
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-else
+ifeq ($(DEVICE_IS_64BIT_ONLY),true)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
+else
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 endif
 #$(call inherit-product, hardware/google_devices/exynos5/exynos5.mk)
 #$(call inherit-product-if-exists, hardware/google_devices/gs101/gs101.mk)
@@ -918,8 +919,7 @@ $(call inherit-product-if-exists, vendor/google/camera/devices/whi/device-vendor
 
 PRODUCT_COPY_FILES += \
 	device/google/gs101/default-permissions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions.xml \
-	device/google/gs101/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml \
-	frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \
+	device/google/gs101/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml
 
 # modem_svc_sit daemon
 PRODUCT_PACKAGES += modem_svc_sit
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index c4da7c13..e65f01ca 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -114,7 +114,7 @@
     <hal format="aidl" optional="true">
         <name>hardware.qorvo.uwb</name>
         <interface>
-            <name>IUwb</name>
+            <name>IUwbVendor</name>
             <instance>default</instance>
         </interface>
     </hal>