diff --git a/src/com/android/car/hvac/HvacController.java b/src/com/android/car/hvac/HvacController.java
index 8c4324d..c18f1cb 100644
--- a/src/com/android/car/hvac/HvacController.java
+++ b/src/com/android/car/hvac/HvacController.java
@@ -27,7 +27,7 @@
 import android.os.Binder;
 import android.os.Handler;
 import android.os.IBinder;
-import android.os.SystemProperties;
+import android.sysprop.CarProperties;
 import android.support.car.Car;
 import android.support.car.CarNotConnectedException;
 import android.support.car.CarConnectionCallback;
@@ -39,7 +39,6 @@
 import javax.annotation.concurrent.GuardedBy;
 
 public class HvacController extends Service {
-    private static final String DEMO_MODE_PROPERTY = "android.car.hvac.demo";
     private static final String TAG = "HvacController";
     private static final int DRIVER_ZONE_ID = VehicleAreaSeat.SEAT_ROW_1_LEFT |
             VehicleAreaSeat.SEAT_ROW_2_LEFT | VehicleAreaSeat.SEAT_ROW_2_CENTER;
@@ -120,7 +119,7 @@
     public void onCreate() {
         super.onCreate();
         if (getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)) {
-            if (SystemProperties.getBoolean(DEMO_MODE_PROPERTY, false)) {
+            if (CarProperties.hvac_demo().orElse(false)) {
                 IBinder binder = (new LocalHvacPropertyService()).getCarPropertyService();
                 initHvacManager(new CarHvacManager(binder, this, new Handler()));
                 return;