diff --git a/device.mk b/device.mk
index 68cbbaf0..4f01b35e 100644
--- a/device.mk
+++ b/device.mk
@@ -265,8 +265,15 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 PRODUCT_VENDOR_PROPERTIES += \
 	ro.opengles.version=196610 \
-	graphics.gpu.profiler.support=true \
-	debug.renderengine.backend=skiaglthreaded \
+	graphics.gpu.profiler.support=true
+# Enable SkiaVk for RenderEngine on Cheetah
+ifneq (,$(filter %cheetah, $(TARGET_PRODUCT)))
+PRODUCT_VENDOR_PROPERTIES += \
+	debug.renderengine.backend=skiavkthreaded
+else
+PRODUCT_VENDOR_PROPERTIES += \
+	debug.renderengine.backend=skiaglthreaded
+endif
 
 # GRAPHICS - GPU (end)
 # ####################
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index b55e69eb..d48ceba7 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -137,7 +137,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>vendor.google.google_battery</name>
-        <version>1</version>
+        <version>2</version>
         <interface>
             <name>IGoogleBattery</name>
             <instance>default</instance>
diff --git a/manifest-gralloc3.xml b/manifest-gralloc3.xml
index 852c76f0..9ecea758 100644
--- a/manifest-gralloc3.xml
+++ b/manifest-gralloc3.xml
@@ -133,7 +133,7 @@
     </hal>
     <hal format="aidl">
         <name>vendor.google.google_battery</name>
-        <version>1</version>
+        <version>2</version>
         <interface>
             <name>IGoogleBattery</name>
             <instance>default</instance>