diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index a188f2b3..b4d90161 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -302,6 +302,9 @@ on init
     # Charging policy
     chown system system /sys/class/power_supply/battery/charging_policy
 
+    # BatteryHealthData
+    chown system system /sys/class/power_supply/battery/first_usage_date
+
     # Battery Defender
     chown system system /sys/devices/platform/google,battery/power_supply/battery/bd_trickle_cnt
     chown system system /sys/devices/platform/google,battery/power_supply/battery/bd_trickle_dry_run
diff --git a/device.mk b/device.mk
index ad84648f..bd3af93f 100644
--- a/device.mk
+++ b/device.mk
@@ -184,6 +184,9 @@ USES_GAUDIO := true
 # Must match BOARD_USES_SWIFTSHADER in BoardConfig.mk
 USE_SWIFTSHADER := false
 
+# by default, USE_ANGLE is false
+USE_ANGLE ?= false
+
 # HWUI
 TARGET_USES_VULKAN = true
 
@@ -219,6 +222,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_3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \
@@ -230,6 +240,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