diff --git a/device-tegu.mk b/device-tegu.mk
index 0d6b180..f350786 100644
--- a/device-tegu.mk
+++ b/device-tegu.mk
@@ -434,3 +434,17 @@ PRODUCT_COPY_FILES += \
 #Component Override for Pixel Troubleshooting App
 PRODUCT_COPY_FILES += \
     device/google/tegu/tegu-component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/tegu-component-overrides.xml
+
+# Enable APF by default
+PRODUCT_VENDOR_PROPERTIES += \
+    vendor.powerhal.apf_disabled=false \
+    vendor.powerhal.apf_enabled=true
+
+# Increment the SVN for any official public releases
+ifdef RELEASE_SVN_TEGU
+TARGET_SVN ?= $(RELEASE_SVN_TEGU)
+else
+# Set this for older releases that don't use build flag
+TARGET_SVN ?= 2
+endif
+