diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000000..6137bef2a2
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,8 @@
+# Code owners file.
+# This file controls who is tagged for review for any given pull request.
+
+# For syntax help see:
+# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
+
+# The java-samples-reviewers team is the default owner for samples changes
+samples/**/*.java       @googleapis/java-samples-reviewers
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index f506e46c10..9ee206e5c6 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -51,9 +51,7 @@ test)
     RETURN_CODE=$?
     ;;
 lint)
-    mvn \
-      -Penable-samples \
-      com.coveo:fmt-maven-plugin:check
+    mvn com.coveo:fmt-maven-plugin:check
     RETURN_CODE=$?
     ;;
 javadoc)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e920b3f352..bb01ce319e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+### [1.93.6](https://www.github.com/googleapis/java-core/compare/v1.93.5...v1.93.6) (2020-06-12)
+
+
+### Dependencies
+
+* update dependency com.google.api:api-common to v1.9.1 ([#221](https://www.github.com/googleapis/java-core/issues/221)) ([4df33f0](https://www.github.com/googleapis/java-core/commit/4df33f0da02855161562e80a9d50e52dc21f4693))
+* update dependency com.google.api:api-common to v1.9.2 ([#229](https://www.github.com/googleapis/java-core/issues/229)) ([e8c1aa2](https://www.github.com/googleapis/java-core/commit/e8c1aa2ff9c1eaa4030faa86b403a77fc6602bdb))
+* update dependency com.google.api:gax-bom to v1.57.0 ([#236](https://www.github.com/googleapis/java-core/issues/236)) ([3d7d2a6](https://www.github.com/googleapis/java-core/commit/3d7d2a69ea95d7cd93f1175e0cc7f051fd591ad8))
+* update dependency com.google.protobuf:protobuf-bom to v3.12.2 ([#220](https://www.github.com/googleapis/java-core/issues/220)) ([815569d](https://www.github.com/googleapis/java-core/commit/815569d7274cccd12110062e72dc8774f3b1d3de))
+* update dependency io.grpc:grpc-bom to v1.30.0 ([#233](https://www.github.com/googleapis/java-core/issues/233)) ([b41c34f](https://www.github.com/googleapis/java-core/commit/b41c34f28a2cddddafbb872bbd0100a934972042))
+
 ### [1.93.5](https://www.github.com/googleapis/java-core/compare/v1.93.4...v1.93.5) (2020-05-26)
 
 
diff --git a/google-cloud-core-bom/pom.xml b/google-cloud-core-bom/pom.xml
index 1f643f7d04..653d115a05 100644
--- a/google-cloud-core-bom/pom.xml
+++ b/google-cloud-core-bom/pom.xml
@@ -3,12 +3,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-core-bom</artifactId>
-  <version>1.93.5</version><!-- {x-version-update:google-cloud-core:current} -->
+  <version>1.93.6</version><!-- {x-version-update:google-cloud-core:current} -->
   <packaging>pom</packaging>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>0.6.0</version>
+    <version>0.8.0</version>
   </parent>
 
   <name>Google Cloud Core</name>
@@ -63,17 +63,17 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-core</artifactId>
-        <version>1.93.5</version><!-- {x-version-update:google-cloud-core:current} -->
+        <version>1.93.6</version><!-- {x-version-update:google-cloud-core:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-core-grpc</artifactId>
-        <version>1.93.5</version><!-- {x-version-update:google-cloud-core:current} -->
+        <version>1.93.6</version><!-- {x-version-update:google-cloud-core:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-core-http</artifactId>
-        <version>1.93.5</version><!-- {x-version-update:google-cloud-core:current} -->
+        <version>1.93.6</version><!-- {x-version-update:google-cloud-core:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/google-cloud-core-grpc/pom.xml b/google-cloud-core-grpc/pom.xml
index 713de0c0f8..e0f77ea270 100644
--- a/google-cloud-core-grpc/pom.xml
+++ b/google-cloud-core-grpc/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-core-grpc</artifactId>
-  <version>1.93.5</version><!-- {x-version-update:google-cloud-core:current} -->
+  <version>1.93.6</version><!-- {x-version-update:google-cloud-core:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Core gRPC</name>
   <url>https://github.com/googleapis/java-core</url>
@@ -13,7 +13,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-core-parent</artifactId>
-    <version>1.93.5</version><!-- {x-version-update:google-cloud-core:current} -->
+    <version>1.93.6</version><!-- {x-version-update:google-cloud-core:current} -->
   </parent>
   <properties>
     <site.installationModule>google-cloud-core-grpc</site.installationModule>
diff --git a/google-cloud-core-http/pom.xml b/google-cloud-core-http/pom.xml
index 514e94a15b..2e89f52c35 100644
--- a/google-cloud-core-http/pom.xml
+++ b/google-cloud-core-http/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-core-http</artifactId>
-  <version>1.93.5</version><!-- {x-version-update:google-cloud-core:current} -->
+  <version>1.93.6</version><!-- {x-version-update:google-cloud-core:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Core HTTP</name>
   <url>https://github.com/googleapis/java-core</url>
@@ -13,7 +13,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-core-parent</artifactId>
-    <version>1.93.5</version><!-- {x-version-update:google-cloud-core:current} -->
+    <version>1.93.6</version><!-- {x-version-update:google-cloud-core:current} -->
   </parent>
   <properties>
     <site.installationModule>google-cloud-core-http</site.installationModule>
diff --git a/google-cloud-core/pom.xml b/google-cloud-core/pom.xml
index 84cd43bda9..26214f446a 100644
--- a/google-cloud-core/pom.xml
+++ b/google-cloud-core/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-core</artifactId>
-  <version>1.93.5</version><!-- {x-version-update:google-cloud-core:current} -->
+  <version>1.93.6</version><!-- {x-version-update:google-cloud-core:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Core</name>
   <url>https://github.com/googleapis/java-core</url>
@@ -13,7 +13,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-core-parent</artifactId>
-    <version>1.93.5</version><!-- {x-version-update:google-cloud-core:current} -->
+    <version>1.93.6</version><!-- {x-version-update:google-cloud-core:current} -->
   </parent>
   <properties>
     <site.installationModule>google-cloud-core</site.installationModule>
diff --git a/google-cloud-core/src/test/java/com/google/cloud/PolicyV3Test.java b/google-cloud-core/src/test/java/com/google/cloud/PolicyV3Test.java
index 13cab4332c..bdddf656f4 100644
--- a/google-cloud-core/src/test/java/com/google/cloud/PolicyV3Test.java
+++ b/google-cloud-core/src/test/java/com/google/cloud/PolicyV3Test.java
@@ -42,28 +42,25 @@ public class PolicyV3Test {
   private static final String VIEWER = "roles/viewer";
   private static final String EDITOR = "roles/editor";
   private static final String OWNER = "roles/owner";
-  private static final List<String> MEMBERS_LIST_1 =
+  private static final ImmutableList<String> MEMBERS_LIST_1 =
       ImmutableList.of(USER, SERVICE_ACCOUNT, ALL_USERS);
-  private static final List<String> MEMBERS_LIST_2 =
+  private static final ImmutableList<String> MEMBERS_LIST_2 =
       ImmutableList.of(ALL_AUTH_USERS, GROUP, DOMAIN);
-  private static final List<Binding> BINDINGS_NO_CONDITIONS =
-      ImmutableList.of(
-          Binding.newBuilder().setRole(VIEWER).setMembers(MEMBERS_LIST_1).build(),
-          Binding.newBuilder().setRole(EDITOR).setMembers(MEMBERS_LIST_2).build());
-  private static final List<Binding> BINDINGS_WITH_CONDITIONS =
-      ImmutableList.copyOf(BINDINGS_NO_CONDITIONS)
-          .of(
-              Binding.newBuilder()
-                  .setRole(VIEWER)
-                  .setMembers(MEMBERS_LIST_1)
-                  .setCondition(
-                      Condition.newBuilder()
-                          .setTitle("Condition")
-                          .setDescription("Condition")
-                          .setExpression("Expr")
-                          .build())
-                  .build(),
-              Binding.newBuilder().setRole(EDITOR).setMembers(MEMBERS_LIST_2).build());
+
+  private static final Binding VIEWER_BINDING =
+      Binding.newBuilder().setRole(VIEWER).setMembers(MEMBERS_LIST_1).build();
+  private static final Binding EDITOR_BINDING =
+      Binding.newBuilder().setRole(EDITOR).setMembers(MEMBERS_LIST_2).build();
+  private static final ImmutableList<Binding> BINDINGS_NO_CONDITIONS =
+      ImmutableList.of(VIEWER_BINDING, EDITOR_BINDING);
+  private static final Condition CONDITION =
+      Condition.newBuilder()
+          .setTitle("Condition")
+          .setDescription("Condition")
+          .setExpression("Expr")
+          .build();
+  private static final ImmutableList<Binding> BINDINGS_WITH_CONDITIONS =
+      ImmutableList.of(VIEWER_BINDING.toBuilder().setCondition(CONDITION).build(), EDITOR_BINDING);
   private static final Policy FULL_POLICY_V1 =
       Policy.newBuilder().setBindings(BINDINGS_NO_CONDITIONS).setEtag("etag").setVersion(1).build();
 
diff --git a/pom.xml b/pom.xml
index 97d39277be..8d9d74fddd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-core-parent</artifactId>
   <packaging>pom</packaging>
-  <version>1.93.5</version><!-- {x-version-update:google-cloud-core:current} -->
+  <version>1.93.6</version><!-- {x-version-update:google-cloud-core:current} -->
   <name>Google Cloud Core Parent</name>
   <url>https://github.com/googleapis/java-core</url>
   <description>
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>0.6.0</version>
+    <version>0.8.0</version>
   </parent>
 
   <developers>
@@ -151,15 +151,15 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <github.global.server>github</github.global.server>
     <site.installationModule>google-cloud-core-parent</site.installationModule>
-    <gax.version>1.56.0</gax.version>
-    <google.api-common.version>1.9.0</google.api-common.version>
+    <gax.version>1.57.0</gax.version>
+    <google.api-common.version>1.9.2</google.api-common.version>
     <google.common-protos.version>1.18.0</google.common-protos.version>
     <google.iam.version>0.13.0</google.iam.version>
     <google.auth.version>0.20.0</google.auth.version>
     <google.api.version>1.30.9</google.api.version>
     <google.http.version>1.35.0</google.http.version>
-    <grpc.version>1.29.0</grpc.version>
-    <protobuf.version>3.12.0</protobuf.version>
+    <grpc.version>1.30.0</grpc.version>
+    <protobuf.version>3.12.2</protobuf.version>
     <opencensus.version>0.24.0</opencensus.version>
     <annotations-api.version>1.3.2</annotations-api.version>
     <guava.version>29.0-android</guava.version><!-- We are currently using the *-android version to support JDK7. -->
@@ -323,7 +323,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>3.1.0</version>
         <reportSets>
           <reportSet>
             <reports>
diff --git a/renovate.json b/renovate.json
index c4e2931d46..94bb6aedaf 100644
--- a/renovate.json
+++ b/renovate.json
@@ -76,5 +76,6 @@
       "groupName": "jackson dependencies"
     }
   ],
-  "semanticCommits": true
+  "semanticCommits": true,
+  "masterIssue": true
 }
\ No newline at end of file
diff --git a/synth.metadata b/synth.metadata
index 522d580091..04d58b9a60 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-core.git",
-        "sha": "e4a04a2486474fef30584c2067e0afd7f8dbb613"
+        "sha": "feed7e4380b564eb33932fe3eb02614e04441b76"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "5b48b0716a36ca069db3038da7e205c87a22ed19"
+        "sha": "987270824bd26f6a8c716d5e2022057b8ae7b26e"
       }
     }
   ]
diff --git a/versions.txt b/versions.txt
index c86d5144e3..4142ea08e4 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,4 +1,4 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-core:1.93.5:1.93.5
\ No newline at end of file
+google-cloud-core:1.93.6:1.93.6
\ No newline at end of file