diff --git a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
index 27d3d3b..15ef2e6 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -911,8 +911,12 @@
     // Mark the type live here, so that the class exists at runtime. Note that this also marks all
     // supertypes as live, so even if the field is actually on a supertype, its class will be live.
     markTypeAsLive(field.clazz);
-    if (field.type.isClassType()) {
-      markTypeAsLive(field.type);
+    DexType fieldType = field.type;
+    if (fieldType.isArrayType()) {
+      fieldType = fieldType.toBaseType(appInfo.dexItemFactory);
+    }
+    if (fieldType.isClassType()) {
+      markTypeAsLive(fieldType);
     }
     // Find the actual field.
     DexEncodedField encodedField = appInfo.resolveFieldOn(field.clazz, field);
@@ -943,8 +947,12 @@
   private void markInstanceFieldAsLive(DexEncodedField field, KeepReason reason) {
     assert field != null;
     markTypeAsLive(field.field.clazz);
-    if (field.field.type.isClassType()) {
-      markTypeAsLive(field.field.type);
+    DexType fieldType = field.field.type;
+    if (fieldType.isArrayType()) {
+      fieldType = fieldType.toBaseType(appInfo.dexItemFactory);
+    }
+    if (fieldType.isClassType()) {
+      markTypeAsLive(fieldType);
     }
     if (Log.ENABLED) {
       Log.verbose(getClass(), "Adding instance field `%s` to live set.", field.field);
@@ -1376,6 +1384,14 @@
           markVirtualMethodAsLive(superCallTarget, KeepReason.invokedViaSuperFrom(method));
         }
       }
+      for (DexType parameterType : method.method.proto.parameters.values) {
+        if (parameterType.isArrayType()) {
+          parameterType = parameterType.toBaseType(appInfo.dexItemFactory);
+        }
+        if (parameterType.isClassType()) {
+          markTypeAsLive(parameterType);
+        }
+      }
       processAnnotations(method.annotations.annotations);
       method.parameterAnnotationsList.forEachAnnotation(this::processAnnotation);
       if (protoLiteExtension != null && protoLiteExtension.appliesTo(method)) {
diff --git a/src/test/java/com/android/tools/r8/shaking/ParameterTypeTest.java b/src/test/java/com/android/tools/r8/shaking/ParameterTypeTest.java
index 97042b8..03bb249 100644
--- a/src/test/java/com/android/tools/r8/shaking/ParameterTypeTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ParameterTypeTest.java
@@ -122,7 +122,6 @@
     assertThat(subInterface, isRenamed());
   }
 
-  @Ignore("b/112452064")
   @Test
   public void test_brokenTypeHierarchy_singleInterface() throws Exception {
     JasminBuilder jasminBuilder = new JasminBuilder();
@@ -199,7 +198,6 @@
     assertThat(subSubject, isPresent());
   }
 
-  @Ignore("b/112452064")
   @Test
   public void test_brokenTypeHierarchy_doubleInterfaces() throws Exception {
     JasminBuilder jasminBuilder = new JasminBuilder();
diff --git a/src/test/java/com/android/tools/r8/shaking/includedescriptorclasses/IncludeDescriptorClassesTest.java b/src/test/java/com/android/tools/r8/shaking/includedescriptorclasses/IncludeDescriptorClassesTest.java
index bc94fa6..092ae1d 100644
--- a/src/test/java/com/android/tools/r8/shaking/includedescriptorclasses/IncludeDescriptorClassesTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/includedescriptorclasses/IncludeDescriptorClassesTest.java
@@ -94,10 +94,11 @@
 
       Result result = runTest(mainClass, proguardConfig);
 
-      // Without includedescriptorclasses return type and argument type are removed.
+      // Without includedescriptorclasses return type is removed.
       result.assertKept(ClassWithNativeMethods.class);
-      result.assertRemoved(NativeArgumentType.class);
       result.assertRemoved(NativeReturnType.class);
+      // Argument type is not removed due to the concern about the broken type hierarchy.
+      result.assertRenamed(NativeArgumentType.class);
       // Field type is not removed due to the concern about the broken type hierarchy.
       result.assertRenamed(InstanceFieldType.class);
       result.assertRenamed(StaticFieldType.class);