diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 73eafa2f..60a18c66 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -114,6 +114,9 @@ BOARD_USES_GRALLOC_ION_SYNC := true
 # This should be the same value as USE_SWIFTSHADER in device.mk
 BOARD_USES_SWIFTSHADER := false
 
+# This should be the same value as USE_ANGLE in device.mk
+BOARD_USES_ANGLE := true
+
 # Gralloc4
 ifeq ($(BOARD_USES_SWIFTSHADER),true)
 $(call soong_config_set,arm_gralloc,gralloc_arm_no_external_afbc,true)
diff --git a/device-common.mk b/device-common.mk
index 4087c310..e45397d7 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -43,3 +43,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 
 # ZramWriteback
 -include hardware/google/pixel/mm/device_gki.mk
+
+# Set thermal warm reset
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.thermal_warmreset = true
diff --git a/device.mk b/device.mk
index e2ba9946..d166f7f9 100644
--- a/device.mk
+++ b/device.mk
@@ -173,6 +173,9 @@ endif
 # Must match BOARD_USES_SWIFTSHADER in BoardConfig.mk
 USE_SWIFTSHADER := false
 
+# Must match BOARD_USES_ANGLE in BoardConfig.mk
+USE_ANGLE := true
+
 # HWUI
 TARGET_USES_VULKAN = true
 
@@ -202,6 +205,13 @@ PRODUCT_PACKAGES += \
 	libGLESv2_swiftshader
 endif
 
+ifeq ($(USE_ANGLE),true)
+PRODUCT_PACKAGES += \
+	libEGL_angle \
+	libGLESv1_CM_angle \
+	libGLESv2_angle
+endif
+
 PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.hardware.opengles.aep.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.opengles.aep.xml \
 	frameworks/native/data/etc/android.hardware.vulkan.version-1_1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \
@@ -213,6 +223,10 @@ PRODUCT_COPY_FILES += \
 ifeq ($(USE_SWIFTSHADER),true)
 PRODUCT_VENDOR_PROPERTIES += \
 	ro.hardware.egl = swiftshader
+else ifeq ($(USE_ANGLE),true)
+PRODUCT_VENDOR_PROPERTIES += \
+	ro.hardware.egl = angle \
+	ro.hardware.egl_legacy = mali
 else
 PRODUCT_VENDOR_PROPERTIES += \
 	ro.hardware.egl = mali