diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index 8b03cf4e..ac9bf140 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -648,6 +648,29 @@ on property:sys.retaildemo.enabled=1
     setprop persist.vendor.charge.stop.level 35
     setprop persist.vendor.charge.start.level 30
 
+# Test Harness Mode default battery profile.
+on  property:persist.sys.test_harness=1 && property:persist.vendor.testing_battery_profile=0
+    setprop persist.vendor.charge.stop.level 70
+    setprop persist.vendor.charge.start.level 35
+    setprop vendor.battery.defender.disable 1
+
+# Extremely restricted battery profile.
+on  property:persist.sys.test_harness=1 && property:persist.vendor.testing_battery_profile=1
+    setprop persist.vendor.charge.stop.level 50
+    setprop persist.vendor.charge.start.level 35
+    setprop vendor.battery.defender.disable 1
+
+# Normal behavior (as if the device was a regular device)
+on  property:persist.sys.test_harness=1 && property:persist.vendor.testing_battery_profile=2
+    setprop persist.vendor.charge.stop.level 100
+    setprop persist.vendor.charge.start.level 0
+
+# Unrestricted, allows charging to 100%
+on  property:persist.sys.test_harness=1 && property:persist.vendor.testing_battery_profile=3
+    setprop persist.vendor.charge.stop.level 100
+    setprop persist.vendor.charge.start.level 0
+    setprop vendor.battery.defender.disable 1
+
 on property:persist.vendor.charge.stop.level=*
     write /sys/devices/platform/google,charger/charge_stop_level ${persist.vendor.charge.stop.level}
 
diff --git a/device-common.mk b/device-common.mk
index 2d88cabe..ae6470bc 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -26,3 +26,6 @@ PRODUCT_COPY_FILES += \
 # Set system properties identifying the chipset
 PRODUCT_VENDOR_PROPERTIES += ro.soc.manufacturer=Google
 PRODUCT_VENDOR_PROPERTIES += ro.soc.model=GS101
+
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.vendor.testing_battery_profile=0