Merge branch 'master' into fixit/method_repeated

gapic/templates/%namespace/%name_%version/%sub/services/%service/client.py.j2

@@ -333,21 +333,21 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
             request = {{ method.input.ident }}(request)
         {% endif %} {# different request package #}
 
-        {#- Vanilla python protobuf wrapper types cannot _set_ repeated fields #}
-        {% if method.flattened_fields -%}
-        # If we have keyword arguments corresponding to fields on the
-        # request, apply these.
-        {% endif -%}
-        {%- for key, field in method.flattened_fields.items() if not(field.repeated) or method.input.ident.package != method.ident.package %}
-        if {{ field.name }} is not None:
-            request.{{ key }} = {{ field.name }}
-        {%- endfor %}
-        {# They can be _extended_, however -#}
-        {%- for key, field in method.flattened_fields.items() if field.repeated %}
-        if {{ field.name }}:
-            request.{{ key }}.extend({{ field.name }})
-        {%- endfor %}
-        {%- endif %}
+            {#- Vanilla python protobuf wrapper types cannot _set_ repeated fields #}
+            {% if method.flattened_fields -%}
+            # If we have keyword arguments corresponding to fields on the
+            # request, apply these.
+            {% endif -%}
+            {%- for key, field in method.flattened_fields.items() if not(field.repeated or method.input.ident.package != method.ident.package) %}
+            if {{ field.name }} is not None:
+                request.{{ key }} = {{ field.name }}
+            {%- endfor %}
+            {# They can be _extended_, however -#}
+            {%- for key, field in method.flattened_fields.items() if field.repeated %}
+            if {{ field.name }}:
+                request.{{ key }}.extend({{ field.name }})
+            {%- endfor %}
+            {%- endif %}
 
         # Wrap the RPC method; this adds retry and timeout information,
         # and friendly error handling.