diff --git a/.kokoro/release/publish_javadoc.cfg b/.kokoro/release/publish_javadoc.cfg
index 9dcbbc9f7..d42f98606 100644
--- a/.kokoro/release/publish_javadoc.cfg
+++ b/.kokoro/release/publish_javadoc.cfg
@@ -27,3 +27,6 @@ before_action {
     }
   }
 }
+
+# Downloads docfx doclet resource. This will be in ${KOKORO_GFILE_DIR}/<doclet name>
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/docfx"
\ No newline at end of file
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriptionAdminClient.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriptionAdminClient.java
index b53ef596d..68ea83759 100644
--- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriptionAdminClient.java
+++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriptionAdminClient.java
@@ -417,6 +417,7 @@ public final Subscription createSubscription(Subscription request) {
    * @deprecated Use {@link #createSubscription(ProjectSubscriptionName, TopicName, PushConfig,
    *     int)} instead.
    */
+  @Deprecated
   public final Subscription createSubscription(
       ProjectSubscriptionName name,
       ProjectTopicName topic,
@@ -2118,10 +2119,10 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) {
    * <p>Sample code:
    *
    * <pre><code>
-   * try (SubscriptionAdminClient topicAdminClient = SubscriptionAdminClient.create()) {
+   * try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) {
    *   String formattedResource = ProjectTopicName.format("[PROJECT]", "[TOPIC]");
    *   Policy policy = Policy.newBuilder().build();
-   *   Policy response = topicAdminClient.setIamPolicy(formattedResource, policy);
+   *   Policy response = subscriptionAdminClient.setIamPolicy(formattedResource, policy);
    * }
    * </code></pre>
    *
@@ -2133,6 +2134,7 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) {
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    * @deprecated Use {@link #setIamPolicy(SetIamPolicyRequest)} instead.
    */
+  @Deprecated
   public final Policy setIamPolicy(String resource, Policy policy) {
     SetIamPolicyRequest request =
         SetIamPolicyRequest.newBuilder().setResource(resource).setPolicy(policy).build();
@@ -2197,9 +2199,9 @@ public final Policy getIamPolicy(GetIamPolicyRequest request) {
    * <p>Sample code:
    *
    * <pre><code>
-   * try (SubscriptionAdminClient topicAdminClient = SubscriptionAdminClient.create()) {
+   * try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) {
    *   String formattedResource = ProjectTopicName.format("[PROJECT]", "[TOPIC]");
-   *   Policy response = topicAdminClient.getIamPolicy(formattedResource);
+   *   Policy response = subscriptionAdminClient.getIamPolicy(formattedResource);
    * }
    * </code></pre>
    *
@@ -2208,6 +2210,7 @@ public final Policy getIamPolicy(GetIamPolicyRequest request) {
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    * @deprecated Use {@link #getIamPolicy(GetIamPolicyRequest)} instead.
    */
+  @Deprecated
   public final Policy getIamPolicy(String resource) {
     GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder().setResource(resource).build();
     return getIamPolicy(request);
@@ -2278,10 +2281,10 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq
    * <p>Sample code:
    *
    * <pre><code>
-   * try (SubscriptionAdminClient topicAdminClient = SubscriptionAdminClient.create()) {
+   * try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) {
    *   String formattedResource = ProjectTopicName.format("[PROJECT]", "[TOPIC]");
    *   List&lt;String&gt; permissions = new ArrayList&lt;&gt;();
-   *   TestIamPermissionsResponse response = topicAdminClient.testIamPermissions(formattedResource, permissions);
+   *   TestIamPermissionsResponse response = subscriptionAdminClient.testIamPermissions(formattedResource, permissions);
    * }
    * </code></pre>
    *
@@ -2293,6 +2296,7 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    * @deprecated Use {@link #testIamPermissions(TestIamPermissionsRequest)} instead.
    */
+  @Deprecated
   public final TestIamPermissionsResponse testIamPermissions(
       String resource, List<String> permissions) {
     TestIamPermissionsRequest request =
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/TopicAdminClient.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/TopicAdminClient.java
index 482969622..f4b0120f8 100644
--- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/TopicAdminClient.java
+++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/TopicAdminClient.java
@@ -255,6 +255,7 @@ public final Topic createTopic(String name) {
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    * @deprecated Use {@link #createTopic(TopicName)} instead.
    */
+  @Deprecated
   public final Topic createTopic(ProjectTopicName name) {
     Topic request = Topic.newBuilder().setName(name == null ? null : name.toString()).build();
     return createTopic(request);
@@ -538,6 +539,7 @@ public final Topic getTopic(String topic) {
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    * @deprecated Use {@link #getTopic(TopicName)} instead.
    */
+  @Deprecated
   public final Topic getTopic(ProjectTopicName topic) {
     GetTopicRequest request =
         GetTopicRequest.newBuilder().setTopic(topic == null ? null : topic.toString()).build();
@@ -792,6 +794,7 @@ public final ListTopicSubscriptionsPagedResponse listTopicSubscriptions(String t
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    * @deprecated Use {@link #listTopicSubscriptions(TopicName)} instead.
    */
+  @Deprecated
   public final ListTopicSubscriptionsPagedResponse listTopicSubscriptions(ProjectTopicName topic) {
     ListTopicSubscriptionsRequest request =
         ListTopicSubscriptionsRequest.newBuilder()
@@ -1106,6 +1109,7 @@ public final void deleteTopic(String topic) {
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    * @deprecated Use {@link #deleteTopic(TopicName)} instead.
    */
+  @Deprecated
   public final void deleteTopic(ProjectTopicName topic) {
     DeleteTopicRequest request =
         DeleteTopicRequest.newBuilder().setTopic(topic == null ? null : topic.toString()).build();
@@ -1214,6 +1218,7 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) {
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    * @deprecated Use {@link #setIamPolicy(SetIamPolicyRequest)} instead.
    */
+  @Deprecated
   public final Policy setIamPolicy(String resource, Policy policy) {
     SetIamPolicyRequest request =
         SetIamPolicyRequest.newBuilder().setResource(resource).setPolicy(policy).build();
@@ -1289,6 +1294,7 @@ public final Policy getIamPolicy(GetIamPolicyRequest request) {
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    * @deprecated Use {@link #getIamPolicy(GetIamPolicyRequest)} instead.
    */
+  @Deprecated
   public final Policy getIamPolicy(String resource) {
     GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder().setResource(resource).build();
     return getIamPolicy(request);
@@ -1374,6 +1380,7 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    * @deprecated Use {@link #testIamPermissions(TestIamPermissionsRequest)} instead.
    */
+  @Deprecated
   public final TestIamPermissionsResponse testIamPermissions(
       String resource, List<String> permissions) {
     TestIamPermissionsRequest request =
diff --git a/synth.metadata b/synth.metadata
index ba55e23c8..aeb41e663 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-pubsub.git",
-        "sha": "ad3b82d029f2ef4098f2f1fa9fd2878e969e50fb"
+        "sha": "d30c26c008a1f642d89985b5cc42377547a782a9"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "6133907dbb3ddab204a17a15d5c53ec0aae9b033"
+        "sha": "3816b080296d4d52975079fd26c110dd26ba25af"
       }
     }
   ],