diff --git a/clients/google-api-services-compute/alpha/2.0.0/com/google/api/services/compute/Compute.java b/clients/google-api-services-compute/alpha/2.0.0/com/google/api/services/compute/Compute.java
index 9f7414d43f7..2194b81e785 100644
--- a/clients/google-api-services-compute/alpha/2.0.0/com/google/api/services/compute/Compute.java
+++ b/clients/google-api-services-compute/alpha/2.0.0/com/google/api/services/compute/Compute.java
@@ -103,7 +103,7 @@ public class Compute extends com.google.api.client.googleapis.services.json.Abst
    *        {@code com.google.api.client.extensions.appengine.http.UrlFetchTransport}</li>
    *        <li>Android: {@code newCompatibleTransport} from
    *        {@code com.google.api.client.extensions.android.http.AndroidHttp}</li>
-   *        <li>Java: {@link com.google.api.client.googleapis.javanet.GoogleNetHttpTransport#newTrustedTransport()}
+   *        <li>Java: {@code com.google.api.client.http.javanet.NetHttpTransport}</li>
    *        </li>
    *        </ul>
    * @param jsonFactory JSON factory, which may be:
@@ -293216,8 +293216,7 @@ private static String chooseEndpoint(com.google.api.client.http.HttpTransport tr
      *        {@code com.google.api.client.extensions.appengine.http.UrlFetchTransport}</li>
      *        <li>Android: {@code newCompatibleTransport} from
      *        {@code com.google.api.client.extensions.android.http.AndroidHttp}</li>
-     *        <li>Java: {@link com.google.api.client.googleapis.javanet.GoogleNetHttpTransport#newTrustedTransport()}
-     *        </li>
+     *        <li>Java: {@code com.google.api.client.http.javanet.NetHttpTransport}</li>
      *        </ul>
      * @param jsonFactory JSON factory, which may be:
      *        <ul>
diff --git a/clients/google-api-services-compute/alpha/2.0.0/com/google/api/services/compute/model/StructuredEntries.java b/clients/google-api-services-compute/alpha/2.0.0/com/google/api/services/compute/model/StructuredEntries.java
index 27a7d679b59..e95ecb226cd 100644
--- a/clients/google-api-services-compute/alpha/2.0.0/com/google/api/services/compute/model/StructuredEntries.java
+++ b/clients/google-api-services-compute/alpha/2.0.0/com/google/api/services/compute/model/StructuredEntries.java
@@ -35,14 +35,14 @@ public final class StructuredEntries extends com.google.api.client.json.GenericJ
    * The value may be {@code null}.
    */
   @com.google.api.client.util.Key
-  private java.util.Map<String, Any> entries;
+  private java.util.Map<String, java.lang.Object> entries;
 
   /**
    * Map of a partner metadata that belong to the same subdomain. It accepts any value including
    * google.protobuf.Struct.
    * @return value or {@code null} for none
    */
-  public java.util.Map<String, Any> getEntries() {
+  public java.util.Map<String, java.lang.Object> getEntries() {
     return entries;
   }
 
@@ -51,7 +51,7 @@ public java.util.Map<String, Any> getEntries() {
    * google.protobuf.Struct.
    * @param entries entries or {@code null} for none
    */
-  public StructuredEntries setEntries(java.util.Map<String, Any> entries) {
+  public StructuredEntries setEntries(java.util.Map<String, java.lang.Object> entries) {
     this.entries = entries;
     return this;
   }
diff --git a/clients/google-api-services-compute/beta/2.0.0/com/google/api/services/compute/Compute.java b/clients/google-api-services-compute/beta/2.0.0/com/google/api/services/compute/Compute.java
index e1229f54a43..8cb3809c737 100644
--- a/clients/google-api-services-compute/beta/2.0.0/com/google/api/services/compute/Compute.java
+++ b/clients/google-api-services-compute/beta/2.0.0/com/google/api/services/compute/Compute.java
@@ -103,7 +103,7 @@ public class Compute extends com.google.api.client.googleapis.services.json.Abst
    *        {@code com.google.api.client.extensions.appengine.http.UrlFetchTransport}</li>
    *        <li>Android: {@code newCompatibleTransport} from
    *        {@code com.google.api.client.extensions.android.http.AndroidHttp}</li>
-   *        <li>Java: {@link com.google.api.client.googleapis.javanet.GoogleNetHttpTransport#newTrustedTransport()}
+   *        <li>Java: {@code com.google.api.client.http.javanet.NetHttpTransport}</li>
    *        </li>
    *        </ul>
    * @param jsonFactory JSON factory, which may be:
@@ -270048,8 +270048,7 @@ private static String chooseEndpoint(com.google.api.client.http.HttpTransport tr
      *        {@code com.google.api.client.extensions.appengine.http.UrlFetchTransport}</li>
      *        <li>Android: {@code newCompatibleTransport} from
      *        {@code com.google.api.client.extensions.android.http.AndroidHttp}</li>
-     *        <li>Java: {@link com.google.api.client.googleapis.javanet.GoogleNetHttpTransport#newTrustedTransport()}
-     *        </li>
+     *        <li>Java: {@code com.google.api.client.http.javanet.NetHttpTransport}</li>
      *        </ul>
      * @param jsonFactory JSON factory, which may be:
      *        <ul>
diff --git a/clients/google-api-services-compute/beta/2.0.0/com/google/api/services/compute/model/StructuredEntries.java b/clients/google-api-services-compute/beta/2.0.0/com/google/api/services/compute/model/StructuredEntries.java
index 27a7d679b59..e95ecb226cd 100644
--- a/clients/google-api-services-compute/beta/2.0.0/com/google/api/services/compute/model/StructuredEntries.java
+++ b/clients/google-api-services-compute/beta/2.0.0/com/google/api/services/compute/model/StructuredEntries.java
@@ -35,14 +35,14 @@ public final class StructuredEntries extends com.google.api.client.json.GenericJ
    * The value may be {@code null}.
    */
   @com.google.api.client.util.Key
-  private java.util.Map<String, Any> entries;
+  private java.util.Map<String, java.lang.Object> entries;
 
   /**
    * Map of a partner metadata that belong to the same subdomain. It accepts any value including
    * google.protobuf.Struct.
    * @return value or {@code null} for none
    */
-  public java.util.Map<String, Any> getEntries() {
+  public java.util.Map<String, java.lang.Object> getEntries() {
     return entries;
   }
 
@@ -51,7 +51,7 @@ public java.util.Map<String, Any> getEntries() {
    * google.protobuf.Struct.
    * @param entries entries or {@code null} for none
    */
-  public StructuredEntries setEntries(java.util.Map<String, Any> entries) {
+  public StructuredEntries setEntries(java.util.Map<String, java.lang.Object> entries) {
     this.entries = entries;
     return this;
   }
diff --git a/clients/google-api-services-compute/v1/2.0.0/com/google/api/services/compute/Compute.java b/clients/google-api-services-compute/v1/2.0.0/com/google/api/services/compute/Compute.java
index 1ed6f6eed50..17ffc76a6d4 100644
--- a/clients/google-api-services-compute/v1/2.0.0/com/google/api/services/compute/Compute.java
+++ b/clients/google-api-services-compute/v1/2.0.0/com/google/api/services/compute/Compute.java
@@ -103,7 +103,7 @@ public class Compute extends com.google.api.client.googleapis.services.json.Abst
    *        {@code com.google.api.client.extensions.appengine.http.UrlFetchTransport}</li>
    *        <li>Android: {@code newCompatibleTransport} from
    *        {@code com.google.api.client.extensions.android.http.AndroidHttp}</li>
-   *        <li>Java: {@link com.google.api.client.googleapis.javanet.GoogleNetHttpTransport#newTrustedTransport()}
+   *        <li>Java: {@code com.google.api.client.http.javanet.NetHttpTransport}</li>
    *        </li>
    *        </ul>
    * @param jsonFactory JSON factory, which may be:
@@ -234047,8 +234047,7 @@ private static String chooseEndpoint(com.google.api.client.http.HttpTransport tr
      *        {@code com.google.api.client.extensions.appengine.http.UrlFetchTransport}</li>
      *        <li>Android: {@code newCompatibleTransport} from
      *        {@code com.google.api.client.extensions.android.http.AndroidHttp}</li>
-     *        <li>Java: {@link com.google.api.client.googleapis.javanet.GoogleNetHttpTransport#newTrustedTransport()}
-     *        </li>
+     *        <li>Java: {@code com.google.api.client.http.javanet.NetHttpTransport}</li>
      *        </ul>
      * @param jsonFactory JSON factory, which may be:
      *        <ul>
diff --git a/generator/src/googleapis/codegen/java_generator.py b/generator/src/googleapis/codegen/java_generator.py
index 609f1782a20..5f0fd946569 100755
--- a/generator/src/googleapis/codegen/java_generator.py
+++ b/generator/src/googleapis/codegen/java_generator.py
@@ -261,12 +261,11 @@ def _GetTypeInfo(self, def_dict):
     if result:
       return result
 
-    # TODO(user): Uncomment this and update golden files.
-    # result = self.type_map.get((json_type, None))
-    # if result:
-    #   return result
-    #
-    # raise ValueError('Unknown type: %s format: %s' % (json_type, json_format))
+    # Fallback to the unformatted base type if exact format mapping is not found.
+    result = self.type_map.get((json_type, None))
+    if result and json_type != 'string':
+      return result
+
 
     return (utilities.CamelCase(json_type), None, None)
 
diff --git a/generator/tests/java_generator_test.py b/generator/tests/java_generator_test.py
index 99cd443690f..0b54f69a03f 100755
--- a/generator/tests/java_generator_test.py
+++ b/generator/tests/java_generator_test.py
@@ -88,6 +88,9 @@ def testGetCodeTypeFromDictionary(self):
         ['java.lang.String', {'type': 'string'}],
         ['java.lang.Long', {'type': 'integer', 'format': 'uint32'}],
         ['java.math.BigInteger', {'type': 'string', 'format': 'uint64'}],
+        ['java.lang.Object', {'type': 'any', 'format': 'unknown'}],
+        ['String', {'type': 'string', 'format': 'unknown'}],
+
     ]
     for test_case in test_cases:
       self.assertEqual(
@@ -110,6 +113,9 @@ def testGetPrimitiveTypeFromDictionary(self):
         [None, {'type': 'string', 'format': 'date-time'}],
         [None, {'type': 'string', 'format': 'uint64'}],
         [None, {'type': 'anything_else', 'format': 'uint64'}],
+        [None, {'type': 'any', 'format': 'unknown'}],
+        [None, {'type': 'string', 'format': 'unknown'}],
+
     ]
 
     for test_case in test_cases: