diff --git a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ViewDescriptor.java b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ViewDescriptor.java
index 529f4a730..8372e631b 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ViewDescriptor.java
+++ b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ViewDescriptor.java
@@ -110,7 +110,7 @@ public class ViewDescriptor extends NodeDescriptor<View> {
             .put("height", InspectorValue.mutable(node.getHeight()))
             .put("width", InspectorValue.mutable(node.getWidth()))
             .put("alpha", InspectorValue.mutable(node.getAlpha()))
-            .put("visibility", sVisibilityMapping.get(node.getVisibility()))
+            .put("visibility", sVisibilityMapping.toPicker(node.getVisibility()))
             .put("background", fromDrawable(node.getBackground()))
             .put("tag", InspectorValue.mutable(node.getTag()))
             .put("keyedTags", getTags(node))
@@ -157,9 +157,9 @@ public class ViewDescriptor extends NodeDescriptor<View> {
 
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
       viewProps
-          .put("layoutDirection", sLayoutDirectionMapping.get(node.getLayoutDirection()))
-          .put("textDirection", sTextDirectionMapping.get(node.getTextDirection()))
-          .put("textAlignment", sTextAlignmentMapping.get(node.getTextAlignment()));
+          .put("layoutDirection", sLayoutDirectionMapping.toPicker(node.getLayoutDirection()))
+          .put("textDirection", sTextDirectionMapping.toPicker(node.getTextDirection()))
+          .put("textAlignment", sTextAlignmentMapping.toPicker(node.getTextAlignment()));
     }
 
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
@@ -595,14 +595,14 @@ public class ViewDescriptor extends NodeDescriptor<View> {
 
     if (layoutParams instanceof FrameLayout.LayoutParams) {
       final FrameLayout.LayoutParams frameLayoutParams = (FrameLayout.LayoutParams) layoutParams;
-      params.put("gravity", sGravityMapping.get(frameLayoutParams.gravity));
+      params.put("gravity", sGravityMapping.toPicker(frameLayoutParams.gravity));
     }
 
     if (layoutParams instanceof LinearLayout.LayoutParams) {
       final LinearLayout.LayoutParams linearLayoutParams = (LinearLayout.LayoutParams) layoutParams;
       params
           .put("weight", InspectorValue.mutable(linearLayoutParams.weight))
-          .put("gravity", sGravityMapping.get(linearLayoutParams.gravity));
+          .put("gravity", sGravityMapping.toPicker(linearLayoutParams.gravity));
     }
 
     return params.build();
diff --git a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/utils/AccessibilityUtil.java b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/utils/AccessibilityUtil.java
index 6570c35a8..48be0ff7f 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/utils/AccessibilityUtil.java
+++ b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/utils/AccessibilityUtil.java
@@ -578,7 +578,7 @@ public final class AccessibilityUtil {
           actionsArrayBuilder.put(actionLabel);
         } else {
           actionsArrayBuilder.put(
-              AccessibilityUtil.sAccessibilityActionMapping.get(action.getId(), false));
+              AccessibilityUtil.sAccessibilityActionMapping.toPicker(action.getId(), false));
         }
       }
       nodeInfoProps.put("actions", actionsArrayBuilder.build());
@@ -693,7 +693,7 @@ public final class AccessibilityUtil {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
       props.put(
           "important-for-accessibility",
-          AccessibilityUtil.sImportantForAccessibilityMapping.get(
+          AccessibilityUtil.sImportantForAccessibilityMapping.toPicker(
               view.getImportantForAccessibility()));
     }