diff --git a/tensorflow/lite/experimental/acceleration/compatibility/devicedb-sample.json b/tensorflow/lite/experimental/acceleration/compatibility/devicedb-sample.json
index 444b4b52d9b..61f9e1210f9 100644
--- a/tensorflow/lite/experimental/acceleration/compatibility/devicedb-sample.json
+++ b/tensorflow/lite/experimental/acceleration/compatibility/devicedb-sample.json
@@ -100,6 +100,10 @@
                             {
                               "variable": "tflite.gpu.status",
                               "value": "SUPPORTED"
+                            },
+                            {
+                              "variable": "tflite.gpu.opencl_status",
+                              "value": "SUPPORTED"
                             }
                           ]
                         }
@@ -146,7 +150,7 @@
                           "value": "j8y18lte",
                           "derived_properties": [
                             {
-                              "variable": "tflite.gpu.status",
+                              "variable": "tflite.gpu.opencl_status",
                               "value": "SUPPORTED"
                             }
                           ]
diff --git a/tensorflow/lite/experimental/acceleration/compatibility/devicedb_test.cc b/tensorflow/lite/experimental/acceleration/compatibility/devicedb_test.cc
index 5cd500c66af..c9c6ff831e5 100644
--- a/tensorflow/lite/experimental/acceleration/compatibility/devicedb_test.cc
+++ b/tensorflow/lite/experimental/acceleration/compatibility/devicedb_test.cc
@@ -115,7 +115,7 @@ TEST_F(DeviceDbTest, StatusLookupWithDevice) {
   variables[kDeviceModel] = "sm_j810m";
   variables[kDeviceName] = "j8y18lte";
   UpdateVariablesFromDatabase(&variables, *device_db_);
-  EXPECT_EQ(variables[gpu::kStatus], gpu::kStatusSupported);
+  EXPECT_EQ(variables[gpu::kOpenCLStatus], gpu::kStatusSupported);
 }
 
 TEST_F(DeviceDbTest, StatusLookupBasedOnDerivedProperties) {
diff --git a/tensorflow/lite/experimental/acceleration/compatibility/variables.h b/tensorflow/lite/experimental/acceleration/compatibility/variables.h
index 4e0b864c037..3904dbdb486 100644
--- a/tensorflow/lite/experimental/acceleration/compatibility/variables.h
+++ b/tensorflow/lite/experimental/acceleration/compatibility/variables.h
@@ -71,10 +71,12 @@ namespace gpu {
 // GPU-delegate derived properties.
 
 // Whether the GPU delegate works in general.
-// Possible values are ("", "SUPPORTED", "UNSUPPORTED"). An empty value for
-// this field means that the device is unsupported.
+// ("UNSET", "UNKNOWN", "SUPPORTED", "UNSUPPORTED").
 constexpr char kStatus[] = "tflite.gpu.status";
 
+// Whether OpenCL should be allowed. Possible values are the SupportStatus enums
+// ("UNSET", "UNKNOWN", "SUPPORTED", "UNSUPPORTED").
+constexpr char kOpenCLStatus[] = "tflite.gpu.opencl_status";
 constexpr char kStatusSupported[] = "SUPPORTED";
 constexpr char kStatusUnsupported[] = "UNSUPPORTED";
 }  // namespace gpu