diff --git a/car-ui-lib/car-ui-lib/src/main/java/com/android/car/ui/utils/DirectManipulationHelper.java b/car-ui-lib/car-ui-lib/src/main/java/com/android/car/ui/utils/DirectManipulationHelper.java
index cdc0257..09d1662 100644
--- a/car-ui-lib/car-ui-lib/src/main/java/com/android/car/ui/utils/DirectManipulationHelper.java
+++ b/car-ui-lib/car-ui-lib/src/main/java/com/android/car/ui/utils/DirectManipulationHelper.java
@@ -32,7 +32,7 @@
 public final class DirectManipulationHelper {
 
     /**
-     * StateDescription for a {@link View} to support direct manipulation mode. It's also used as
+     * ContentDescription for a {@link View} to support direct manipulation mode. It's also used as
      * class name of {@link AccessibilityEvent} to indicate that the AccessibilityEvent represents
      * a request to toggle direct manipulation mode.
      */
@@ -79,7 +79,7 @@
     /** Returns whether the given {@code node} supports rotate directly. */
     @TargetApi(R)
     public static boolean supportRotateDirectly(@NonNull AccessibilityNodeInfo node) {
-        return TextUtils.equals(DIRECT_MANIPULATION, node.getStateDescription());
+        return TextUtils.equals(DIRECT_MANIPULATION, node.getContentDescription());
     }
 
     /**
@@ -100,7 +100,7 @@
      */
     @TargetApi(R)
     public static void setSupportsRotateDirectly(@NonNull View view, boolean enable) {
-        view.setStateDescription(enable ? DIRECT_MANIPULATION : null);
+        view.setContentDescription(enable ? DIRECT_MANIPULATION : null);
     }
 
     /**
