diff --git a/google/pubsub/v1/pubsub_gapic.yaml b/google/pubsub/v1/pubsub_gapic.yaml
index 642f08e2..d92c1db6 100644
--- a/google/pubsub/v1/pubsub_gapic.yaml
+++ b/google/pubsub/v1/pubsub_gapic.yaml
@@ -28,7 +28,7 @@ interfaces:
     - UNAVAILABLE
     - DEADLINE_EXCEEDED
   - name: non_idempotent
-    retry_codes:
+    retry_codes: []
   retry_params_def:
   - name: default
     initial_retry_delay_millis: 100
@@ -50,129 +50,130 @@ interfaces:
   - name: CreateSubscription
     flattening:
       groups:
-        - parameters:
-          - name
-          - topic
-          - push_config
-          - ack_deadline_seconds
+      - parameters:
+        - name
+        - topic
+        - push_config
+        - ack_deadline_seconds
     required_fields:
-      - name
-      - topic
+    - name
+    - topic
+    request_object_method: true
     retry_codes_name: idempotent
     retry_params_name: default
-    timeout_millis: 30000
-    request_object_method: true
     field_name_patterns:
       name: subscription
       topic: topic
+    timeout_millis: 60000
   - name: GetSubscription
     flattening:
       groups:
-        - parameters:
-          - subscription
+      - parameters:
+        - subscription
     required_fields:
-      - subscription
+    - subscription
+    request_object_method: false
     retry_codes_name: idempotent
     retry_params_name: default
-    timeout_millis: 30000
-    request_object_method: false
     field_name_patterns:
       subscription: subscription
+    timeout_millis: 60000
   - name: ListSubscriptions
+    flattening:
+      groups:
+      - parameters:
+        - project
+    required_fields:
+    - project
+    request_object_method: true
     page_streaming:
       request:
+        page_size_field: page_size
         token_field: page_token
       response:
         token_field: next_page_token
         resources_field: subscriptions
-    flattening:
-      groups:
-        - parameters:
-          - project
-    required_fields:
-      - project
     retry_codes_name: idempotent
     retry_params_name: default
-    timeout_millis: 30000
-    request_object_method: true
     field_name_patterns:
       project: project
+    timeout_millis: 60000
   - name: DeleteSubscription
     flattening:
       groups:
-        - parameters:
-          - subscription
+      - parameters:
+        - subscription
     required_fields:
-      - subscription
+    - subscription
+    request_object_method: false
     retry_codes_name: idempotent
     retry_params_name: default
-    timeout_millis: 30000
-    request_object_method: false
     field_name_patterns:
       subscription: subscription
+    timeout_millis: 60000
   - name: ModifyAckDeadline
     flattening:
       groups:
-        - parameters:
-          - subscription
-          - ack_ids
-          - ack_deadline_seconds
+      - parameters:
+        - subscription
+        - ack_ids
+        - ack_deadline_seconds
     required_fields:
-      - subscription
-      - ack_ids
-      - ack_deadline_seconds
+    - subscription
+    - ack_ids
+    - ack_deadline_seconds
+    request_object_method: true
     retry_codes_name: non_idempotent
     retry_params_name: default
-    timeout_millis: 30000
-    request_object_method: true
     field_name_patterns:
       subscription: subscription
+    timeout_millis: 60000
   - name: Acknowledge
     flattening:
       groups:
-        - parameters:
-          - subscription
-          - ack_ids
+      - parameters:
+        - subscription
+        - ack_ids
     required_fields:
-      - subscription
-      - ack_ids
+    - subscription
+    - ack_ids
+    request_object_method: true
     retry_codes_name: non_idempotent
     retry_params_name: messaging
-    timeout_millis: 30000
-    request_object_method: true
     field_name_patterns:
       subscription: subscription
+    timeout_millis: 60000
   - name: Pull
     flattening:
       groups:
-        - parameters:
-          - subscription
-          - return_immediately
-          - max_messages
+      - parameters:
+        - subscription
+        - return_immediately
+        - max_messages
     required_fields:
-      - subscription
-      - max_messages
+    - subscription
+    - max_messages
+    request_object_method: true
     retry_codes_name: non_idempotent
     retry_params_name: messaging
-    timeout_millis: 30000
-    request_object_method: true
     field_name_patterns:
       subscription: subscription
+    timeout_millis: 60000
   - name: ModifyPushConfig
     flattening:
       groups:
-        - parameters:
-          - subscription
-          - push_config
+      - parameters:
+        - subscription
+        - push_config
     required_fields:
-      - subscription
-      - push_config
+    - subscription
+    - push_config
+    request_object_method: true
     retry_codes_name: non_idempotent
     retry_params_name: default
-    timeout_millis: 30000
-    request_object_method: true
     field_name_patterns:
       subscription: subscription
+    timeout_millis: 60000
 - name: google.pubsub.v1.Publisher
   collections:
   - name_pattern: projects/{project}
@@ -189,7 +190,7 @@ interfaces:
     - UNAVAILABLE
     - DEADLINE_EXCEEDED
   - name: non_idempotent
-    retry_codes:
+    retry_codes: []
   retry_params_def:
   - name: default
     initial_retry_delay_millis: 100
@@ -211,29 +212,28 @@ interfaces:
   - name: CreateTopic
     flattening:
       groups:
-        - parameters:
-          - name
+      - parameters:
+        - name
     required_fields:
-      - name
+    - name
+    request_object_method: false
     retry_codes_name: idempotent
     retry_params_name: default
-    timeout_millis: 30000
-    request_object_method: false
     field_name_patterns:
       name: topic
+    timeout_millis: 60000
   - name: Publish
     flattening:
       groups:
-        - parameters:
-          - topic
-          - messages
+      - parameters:
+        - topic
+        - messages
     required_fields:
-      - topic
-      - messages
+    - topic
+    - messages
+    request_object_method: true
     retry_codes_name: one_plus_delivery
     retry_params_name: messaging
-    timeout_millis: 30000
-    request_object_method: true
     bundling:
       thresholds:
         element_count_threshold: 10
@@ -249,68 +249,71 @@ interfaces:
     field_name_patterns:
       topic: topic
     sample_code_init_fields:
-      - messages[0].data
+    - messages[0].data
+    timeout_millis: 60000
   - name: GetTopic
     flattening:
       groups:
-        - parameters:
-          - topic
+      - parameters:
+        - topic
     required_fields:
-      - topic
+    - topic
+    request_object_method: false
     retry_codes_name: idempotent
     retry_params_name: default
-    timeout_millis: 30000
-    request_object_method: false
     field_name_patterns:
       topic: topic
+    timeout_millis: 60000
   - name: ListTopics
+    flattening:
+      groups:
+      - parameters:
+        - project
+    required_fields:
+    - project
+    request_object_method: true
     page_streaming:
       request:
+        page_size_field: page_size
         token_field: page_token
       response:
         token_field: next_page_token
         resources_field: topics
-    flattening:
-      groups:
-        - parameters:
-          - project
-    required_fields:
-      - project
     retry_codes_name: idempotent
     retry_params_name: default
-    timeout_millis: 30000
-    request_object_method: true
     field_name_patterns:
       project: project
+    timeout_millis: 60000
   - name: ListTopicSubscriptions
+    flattening:
+      groups:
+      - parameters:
+        - topic
+    required_fields:
+    - topic
+    request_object_method: true
     page_streaming:
       request:
+        page_size_field: page_size
         token_field: page_token
       response:
         token_field: next_page_token
         resources_field: subscriptions
-    flattening:
-      groups:
-        - parameters:
-          - topic
-    required_fields:
-      - topic
     retry_codes_name: idempotent
     retry_params_name: default
-    timeout_millis: 30000
-    request_object_method: true
     field_name_patterns:
       topic: topic
+    timeout_millis: 60000
   - name: DeleteTopic
     flattening:
       groups:
-        - parameters:
-          - topic
+      - parameters:
+        - topic
     required_fields:
-      - topic
+    - topic
+    request_object_method: false
     retry_codes_name: idempotent
     retry_params_name: default
-    timeout_millis: 30000
-    request_object_method: false
     field_name_patterns:
       topic: topic
+    timeout_millis: 60000