diff --git a/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/FlipperEditor.java b/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/FlipperEditor.java
index 54b4f0d4d..a5d54232f 100644
--- a/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/FlipperEditor.java
+++ b/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/FlipperEditor.java
@@ -7,7 +7,6 @@
 
 package com.facebook.flipper.plugins.litho;
 
-import androidx.core.util.Pair;
 import com.facebook.flipper.core.FlipperArray;
 import com.facebook.flipper.core.FlipperDynamic;
 import com.facebook.flipper.core.FlipperObject;
@@ -135,9 +134,9 @@ public class FlipperEditor {
     while (keys.hasNext()) {
       final String field = keys.next();
       final FlipperObject object = flipperObject.getObject(field);
-      final Pair<SetDataOperations.FlipperValueHint, FlipperDynamic> value =
+      final SetDataOperations.HintedFlipperDynamic value =
           SetDataOperations.parseLayoutEditorMessage(object);
-      values.put(field, parseEditorValue(value.first, value.second));
+      values.put(field, parseEditorValue(value.kind, value.value));
     }
     return values;
   }
@@ -146,9 +145,9 @@ public class FlipperEditor {
     ArrayList<EditorValue> values = new ArrayList<>();
     for (int i = 0; i < flipperArray.length(); i++) {
       final FlipperObject object = flipperArray.getObject(i);
-      final Pair<SetDataOperations.FlipperValueHint, FlipperDynamic> value =
+      final SetDataOperations.HintedFlipperDynamic value =
           SetDataOperations.parseLayoutEditorMessage(object);
-      values.add(parseEditorValue(value.first, value.second));
+      values.add(parseEditorValue(value.kind, value.value));
     }
 
     return values;
diff --git a/android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorFlipperPlugin.java b/android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorFlipperPlugin.java
index d0e052289..c1259ac88 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorFlipperPlugin.java
+++ b/android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorFlipperPlugin.java
@@ -12,7 +12,6 @@ import android.content.Context;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityEvent;
-import androidx.core.util.Pair;
 import com.facebook.flipper.core.ErrorReportingRunnable;
 import com.facebook.flipper.core.FlipperArray;
 import com.facebook.flipper.core.FlipperConnection;
@@ -339,10 +338,10 @@ public class InspectorFlipperPlugin implements FlipperPlugin {
           if (wrapper instanceof FlipperObject && ((FlipperObject) wrapper).contains("kind")) {
 
             // New message with tagged types
-            final Pair<SetDataOperations.FlipperValueHint, FlipperDynamic> message =
+            final SetDataOperations.HintedFlipperDynamic message =
                 SetDataOperations.parseLayoutEditorMessage((FlipperObject) wrapper);
-            hint = message.first;
-            value = message.second;
+            hint = message.kind;
+            value = message.value;
 
           } else {
             // Old message with untagged types
diff --git a/android/src/main/java/com/facebook/flipper/plugins/inspector/SetDataOperations.java b/android/src/main/java/com/facebook/flipper/plugins/inspector/SetDataOperations.java
index 270dbc542..995d00d69 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/inspector/SetDataOperations.java
+++ b/android/src/main/java/com/facebook/flipper/plugins/inspector/SetDataOperations.java
@@ -7,7 +7,6 @@
 
 package com.facebook.flipper.plugins.inspector;
 
-import androidx.core.util.Pair;
 import com.facebook.flipper.core.FlipperDynamic;
 import com.facebook.flipper.core.FlipperObject;
 import javax.annotation.Nullable;
@@ -21,11 +20,20 @@ public final class SetDataOperations {
    * @param wrapper the object containing the elements
    * @return a pair of a nullable hint and the uncasted value as a FlipperDynamic
    */
-  public static Pair<FlipperValueHint, FlipperDynamic> parseLayoutEditorMessage(
-      FlipperObject wrapper) {
+  public static HintedFlipperDynamic parseLayoutEditorMessage(FlipperObject wrapper) {
     final FlipperValueHint kind = FlipperValueHint.fromString(wrapper.getString("kind"));
     final FlipperDynamic value = wrapper.getDynamic("data");
-    return new Pair<>(kind, value);
+    return new HintedFlipperDynamic(kind, value);
+  }
+
+  public static final class HintedFlipperDynamic {
+    public final @Nullable FlipperValueHint kind;
+    public final FlipperDynamic value;
+
+    public HintedFlipperDynamic(@Nullable FlipperValueHint kind, FlipperDynamic value) {
+      this.kind = kind;
+      this.value = value;
+    }
   }
 
   /** Each supported type of the Layout Editor protocol for values */