diff --git a/gapic/api/artman_streetview_publish.yaml b/gapic/api/artman_streetview_publish.yaml
new file mode 100644
index 00000000..dcd1f3e1
--- /dev/null
+++ b/gapic/api/artman_streetview_publish.yaml
@@ -0,0 +1,27 @@
+common:
+  api_name: streetview_publish
+  api_version: v1
+  organization_name: google-maps
+  service_yaml: google/streetview/publish/streetview_publish.yaml
+  gapic_yaml: google/streetview/publish/streetview_publish_gapic.yaml
+  src_proto_paths:
+  - google/streetview/publish/v1
+  proto_deps:
+  - name: google-common-protos
+artifacts:
+- name: java_gapic
+  language: JAVA
+- name: python_gapic
+  language: PYTHON
+- name: php_gapic
+  language: PHP
+- name: ruby_gapic
+  language: RUBY
+- name: go_gapic
+  language: GO
+- name: csharp_gapic
+  language: CSHARP
+- name: nodejs_gapic
+  language: NODEJS
+- name: gapic_config
+  type: GAPIC_CONFIG
diff --git a/google/bigtable/admin/cluster/bigtableclusteradmin.yaml b/google/bigtable/admin/cluster/bigtableclusteradmin.yaml
new file mode 100644
index 00000000..be789aa7
--- /dev/null
+++ b/google/bigtable/admin/cluster/bigtableclusteradmin.yaml
@@ -0,0 +1,39 @@
+type: google.api.Service
+config_version: 0
+name: bigtableclusteradmin.googleapis.com
+title: Google Cloud Bigtable Cluster Admin API
+
+apis:
+- name: google.longrunning.Operations
+- name: google.bigtable.admin.cluster.v1.BigtableClusterService
+- name: google.bigtable.admin.v2.BigtableInstanceAdmin
+
+types:
+- name: google.bigtable.admin.cluster.v1.CreateClusterMetadata
+- name: google.bigtable.admin.cluster.v1.UpdateClusterMetadata
+- name: google.bigtable.admin.cluster.v1.UndeleteClusterMetadata
+- name: google.bigtable.admin.cluster.v1.V2OperationMetadata
+- name: google.bigtable.admin.v2.CreateInstanceMetadata
+- name: google.bigtable.admin.v2.UpdateClusterMetadata
+
+authentication:
+  rules:
+  - selector: '*'
+    oauth:
+      canonical_scopes: >-
+        https://www.googleapis.com/auth/bigtable.admin,
+        https://www.googleapis.com/auth/bigtable.admin.cluster,
+        https://www.googleapis.com/auth/bigtable.admin.instance,
+        https://www.googleapis.com/auth/cloud-bigtable.admin,
+        https://www.googleapis.com/auth/cloud-bigtable.admin.cluster,
+        https://www.googleapis.com/auth/cloud-platform
+  - selector: google.bigtable.admin.cluster.v1.BigtableClusterService.GetCluster
+    oauth:
+      canonical_scopes: >-
+        https://www.googleapis.com/auth/bigtable.admin,
+        https://www.googleapis.com/auth/bigtable.admin.cluster,
+        https://www.googleapis.com/auth/bigtable.admin.instance,
+        https://www.googleapis.com/auth/cloud-bigtable.admin,
+        https://www.googleapis.com/auth/cloud-bigtable.admin.cluster,
+        https://www.googleapis.com/auth/cloud-platform,
+        https://www.googleapis.com/auth/cloud-platform.read-only
diff --git a/google/bigtable/admin/table/bigtabletableadmin.yaml b/google/bigtable/admin/table/bigtabletableadmin.yaml
new file mode 100644
index 00000000..e1b7886b
--- /dev/null
+++ b/google/bigtable/admin/table/bigtabletableadmin.yaml
@@ -0,0 +1,27 @@
+type: google.api.Service
+config_version: 0
+name: bigtabletableadmin.googleapis.com
+title: Google Cloud Bigtable Table Admin API
+
+apis:
+- name: google.bigtable.admin.table.v1.BigtableTableService
+
+authentication:
+  rules:
+  - selector: '*'
+    oauth:
+      canonical_scopes: >-
+        https://www.googleapis.com/auth/bigtable.admin,
+        https://www.googleapis.com/auth/bigtable.admin.table,
+        https://www.googleapis.com/auth/cloud-bigtable.admin,
+        https://www.googleapis.com/auth/cloud-bigtable.admin.table,
+        https://www.googleapis.com/auth/cloud-platform
+  - selector: google.bigtable.admin.table.v1.BigtableTableService.GetTable
+    oauth:
+      canonical_scopes: >-
+        https://www.googleapis.com/auth/bigtable.admin,
+        https://www.googleapis.com/auth/bigtable.admin.table,
+        https://www.googleapis.com/auth/cloud-bigtable.admin,
+        https://www.googleapis.com/auth/cloud-bigtable.admin.table,
+        https://www.googleapis.com/auth/cloud-platform,
+        https://www.googleapis.com/auth/cloud-platform.read-only
diff --git a/google/cloud/language/language.yaml b/google/cloud/language/language.yaml
new file mode 100644
index 00000000..02db1f6f
--- /dev/null
+++ b/google/cloud/language/language.yaml
@@ -0,0 +1,30 @@
+type: google.api.Service
+config_version: 3
+name: language.googleapis.com
+title: Google Cloud Natural Language API
+
+apis:
+- name: google.cloud.language.v1.LanguageService
+- name: google.cloud.language.v1beta1.LanguageService
+- name: google.cloud.language.v1beta2.LanguageService
+
+types:
+- name: google.protobuf.Timestamp
+- name: google.rpc.Status
+
+enums:
+- name: google.rpc.Code
+
+documentation:
+  summary: |-
+    Provides natural language understanding technologies to developers. Examples
+    include sentiment analysis, entity recognition, entity sentiment analysis,
+    and text annotations.
+
+authentication:
+  rules:
+  - selector: '*'
+    oauth:
+      canonical_scopes: |-
+        https://www.googleapis.com/auth/cloud-language,
+        https://www.googleapis.com/auth/cloud-platform
diff --git a/google/cloud/runtimeconfig/runtimeconfig.yaml b/google/cloud/runtimeconfig/runtimeconfig.yaml
new file mode 100644
index 00000000..1f66c9b6
--- /dev/null
+++ b/google/cloud/runtimeconfig/runtimeconfig.yaml
@@ -0,0 +1,49 @@
+type: google.api.Service
+config_version: 3
+name: runtimeconfig.googleapis.com
+title: Google Cloud RuntimeConfig API
+
+apis:
+- name: google.longrunning.Operations
+- name: google.cloud.runtimeconfig.v1beta1.RuntimeConfigManager
+- name: google.iam.v1.IAMPolicy
+
+# Documentation section
+documentation:
+  summary:
+    Provides capabilities for dynamic configuration and coordination for applications running on Google Cloud Platform.
+
+
+http:
+  rules:
+  - selector: google.longrunning.Operations.GetOperation
+    get: '/v1beta1/{name=projects/*/configs/*/operations/**}'
+
+  - selector: google.iam.v1.IAMPolicy.SetIamPolicy
+    post: '/v1beta1/{resource=projects/*/configs/*}:setIamPolicy'
+    body: '*'
+
+  - selector: google.iam.v1.IAMPolicy.GetIamPolicy
+    get: '/v1beta1/{resource=projects/*/configs/*}:getIamPolicy'
+
+  - selector: google.iam.v1.IAMPolicy.TestIamPermissions
+    post: '/v1beta1/{resource=projects/*/configs/*}:testIamPermissions'
+    body: '*'
+    additional_bindings:
+    - post: '/v1beta1/{resource=projects/*/configs/*/waiters/*}:testIamPermissions'
+      body: '*'
+
+    - post: '/v1beta1/{resource=projects/*/configs/*/variables/**}:testIamPermissions'
+      body: '*'
+
+    - post: '/v1beta1/{resource=projects/*/configs/*/operations/**}:testIamPermissions'
+      body: '*'
+
+
+# Auth section
+authentication:
+  rules:
+  - selector: '*'
+    oauth:
+      canonical_scopes: https://www.googleapis.com/auth/cloud-platform,
+                        https://www.googleapis.com/auth/cloudruntimeconfig
diff --git a/google/cloud/speech/speech.yaml b/google/cloud/speech/speech.yaml
new file mode 100644
index 00000000..4e7c59fb
--- /dev/null
+++ b/google/cloud/speech/speech.yaml
@@ -0,0 +1,56 @@
+type: google.api.Service
+config_version: 3
+name: speech.googleapis.com
+title: Google Cloud Speech API
+
+apis:
+- name: google.cloud.speech.v1.Speech
+- name: google.cloud.speech.v1p1beta1.Speech
+- name: google.cloud.speech.v1beta1.Speech
+
+types:
+- name: google.rpc.Status
+- name: google.protobuf.Timestamp
+
+enums:
+- name: google.rpc.Code
+
+documentation:
+  summary: Converts audio to text by applying powerful neural network models.
+  overview: |-
+    # Introduction
+
+    Google Cloud Speech API provides speech recognition as a service.
+
+http:
+  rules:
+  - selector: google.longrunning.Operations.ListOperations
+    get: /v1/operations
+    additional_bindings:
+    - get: /v1beta1/operations
+
+  - selector: google.longrunning.Operations.GetOperation
+    get: '/v1/operations/{name=*}'
+    additional_bindings:
+    - get: '/v1beta1/operations/{name=*}'
+
+    - get: '/v1p1beta1/operations/{name=*}'
+
+  - selector: google.longrunning.Operations.DeleteOperation
+    delete: '/v1/operations/{name=*}'
+    additional_bindings:
+    - delete: '/v1beta1/operations/{name=*}'
+
+  - selector: google.longrunning.Operations.CancelOperation
+    post: '/v1/operations/{name=*}:cancel'
+    body: '*'
+    additional_bindings:
+    - post: '/v1beta1/operations/{name=*}:cancel'
+
+
+authentication:
+  rules:
+  - selector: '*'
+    oauth:
+      canonical_scopes: |-
+        https://www.googleapis.com/auth/cloud-platform
diff --git a/google/cloud/videointelligence/videointelligence.yaml b/google/cloud/videointelligence/videointelligence.yaml
index 00a35188..62e1227a 100644
--- a/google/cloud/videointelligence/videointelligence.yaml
+++ b/google/cloud/videointelligence/videointelligence.yaml
@@ -2,59 +2,26 @@ type: google.api.Service
 config_version: 3
 name: videointelligence.googleapis.com
 title: Google Cloud Video Intelligence API
-producer_project_id: videointelligence-producer
 
-control:
-  environment: servicecontrol.googleapis.com
-
-# Included protobuf APIs.
 apis:
 - name: google.cloud.videointelligence.v1beta1.VideoIntelligenceService
 
-# Documentation section.
 documentation:
   summary:
     Google Cloud Video Intelligence API.
-  overview:
-    (== include google/cloud/videointelligence/overview.md ==)
 
-usage:
-  # Grant access to the members of the email lists specified at:
-  # https://pantheon.corp.google.com/endpoints/api/videointelligence.googleapis.com/developers
-  ## service_access: RESTRICTED
-
-  requirements:
-  - serviceusage.googleapis.com/tos/cloud
-
-# Auth section.
 authentication:
-  ## gaia_service: xapi
   rules:
     - selector: '*'
-      allow_without_credential: true
       oauth:
         canonical_scopes: https://www.googleapis.com/auth/cloud-platform
 
-# Context section.
-context:
-  rules:
-  - selector: '*'
-    requested:
-    - google.rpc.context.OriginContext
-    - google.rpc.context.ProjectContext
-
 types:
 - name: google.cloud.videointelligence.v1beta1.AnnotateVideoResponse
 - name: google.cloud.videointelligence.v1beta1.AnnotateVideoProgress
 - name: google.cloud.videointelligence.v1beta1.VideoSegment
 - name: google.rpc.Status
 
-backend:
-  rules:
-   - selector: "*"
-     deadline: 600.0
-
-# HTTP overrides.
 http:
   rules:
   - selector: google.longrunning.Operations.GetOperation
diff --git a/google/cloud/videointelligence/videointelligence_v1beta2.yaml b/google/cloud/videointelligence/videointelligence_v1beta2.yaml
index 303fc03c..37918a95 100644
--- a/google/cloud/videointelligence/videointelligence_v1beta2.yaml
+++ b/google/cloud/videointelligence/videointelligence_v1beta2.yaml
@@ -2,58 +2,27 @@ type: google.api.Service
 config_version: 3
 name: videointelligence.googleapis.com
 title: Google Cloud Video Intelligence API
-producer_project_id: videointelligence-producer
 
-control:
-  environment: servicecontrol.googleapis.com
-
-# Included protobuf APIs.
 apis:
 - name: google.cloud.videointelligence.v1beta2.VideoIntelligenceService
 
-# Documentation section.
 documentation:
   summary:
     Google Cloud Video Intelligence API.
-  overview:
-    (== include google/cloud/videointelligence/overview.md ==)
 
-usage:
-  # Grant access to the members of the email lists specified at:
-  # https://pantheon.corp.google.com/endpoints/api/videointelligence.googleapis.com/developers
-  ## service_access: RESTRICTED
-
-  requirements:
-  - serviceusage.googleapis.com/tos/cloud
-
-# Auth section.
 authentication:
-  ## gaia_service: xapi
   rules:
     - selector: '*'
       allow_without_credential: true
       oauth:
         canonical_scopes: https://www.googleapis.com/auth/cloud-platform
 
-# Context section.
-context:
-  rules:
-  - selector: '*'
-    requested:
-    - google.rpc.context.OriginContext
-    - google.rpc.context.ProjectContext
-
 types:
 - name: google.cloud.videointelligence.v1beta2.AnnotateVideoResponse
 - name: google.cloud.videointelligence.v1beta2.AnnotateVideoProgress
 - name: google.cloud.videointelligence.v1beta2.VideoSegment
 - name: google.rpc.Status
 
-backend:
-  rules:
-   - selector: "*"
-     deadline: 600.0
-
 # HTTP overrides.
 http:
   rules:
diff --git a/google/container/container.yaml b/google/container/container.yaml
new file mode 100644
index 00000000..df640fa7
--- /dev/null
+++ b/google/container/container.yaml
@@ -0,0 +1,19 @@
+type: google.api.Service
+config_version: 3
+name: container.googleapis.com
+title: Google Container Engine API
+
+apis:
+- name: google.container.v1.ClusterManager
+
+documentation:
+  summary: |-
+    The Google Container Engine API is used for building and managing container
+    based applications, powered by the open source Kubernetes technology.
+
+authentication:
+  rules:
+  - selector: '*'
+    oauth:
+      canonical_scopes: |-
+        https://www.googleapis.com/auth/cloud-platform
diff --git a/google/devtools/cloudbuild/cloudbuild.yaml b/google/devtools/cloudbuild/cloudbuild.yaml
new file mode 100644
index 00000000..2ce520a4
--- /dev/null
+++ b/google/devtools/cloudbuild/cloudbuild.yaml
@@ -0,0 +1,26 @@
+type: google.api.Service
+config_version: 3
+name: cloudbuild.googleapis.com
+title: Google Cloud Container Builder API
+
+apis:
+- name: google.devtools.cloudbuild.v1.CloudBuild
+
+types:
+- name: google.devtools.cloudbuild.v1.BuildOperationMetadata
+
+documentation:
+  summary: Builds container images in the cloud.
+  overview: |-
+    The Google Cloud Container Builder API lets you to build an application or
+    part of an application from source code stored in Google Cloud Storage or a
+    Google Cloud Source Repository and package it into container images. The
+    container images are then stored in Google Container Registry. You can
+    optionally copy the images to another container registry as required.
+
+authentication:
+  rules:
+  - selector: '*'
+    oauth:
+      canonical_scopes: |-
+        https://www.googleapis.com/auth/cloud-platform
diff --git a/google/devtools/cloudprofiler/cloudprofiler.yaml b/google/devtools/cloudprofiler/cloudprofiler.yaml
new file mode 100644
index 00000000..d2f6e3d7
--- /dev/null
+++ b/google/devtools/cloudprofiler/cloudprofiler.yaml
@@ -0,0 +1,22 @@
+type: google.api.Service
+config_version: 3
+name: cloudprofiler.googleapis.com
+title: Google Cloud Profiler API
+
+apis:
+- name: google.devtools.cloudprofiler.v2.ProfilerService
+
+documentation:
+  summary: Allows Google services to send in continuous profiling information.
+  overview: |-
+    The Google Cloud Profiler API allows Google services manage the continuous
+    profiling information collected in cloud environments like Flex and GCE VMs.
+
+authentication:
+  rules:
+  - selector: '*'
+    oauth:
+      canonical_scopes: |-
+        https://www.googleapis.com/auth/cloud-platform,
+        https://www.googleapis.com/auth/monitoring,
+        https://www.googleapis.com/auth/monitoring.write
diff --git a/google/devtools/cloudtrace/cloudtrace.yaml b/google/devtools/cloudtrace/cloudtrace.yaml
new file mode 100644
index 00000000..abbbe550
--- /dev/null
+++ b/google/devtools/cloudtrace/cloudtrace.yaml
@@ -0,0 +1,26 @@
+type: google.api.Service
+config_version: 2
+name: cloudtrace.googleapis.com
+title: Stackdriver Trace API
+
+apis:
+- name: google.devtools.cloudtrace.v1.TraceService
+
+documentation:
+  summary: >-
+    Send and retrieve trace data from Stackdriver Trace. Data is generated and
+    available by default for all App Engine applications. Data from other
+    applications can be written to Stackdriver Trace for display, reporting, and
+    analysis.
+
+
+authentication:
+  rules:
+  - selector: '*'
+    oauth:
+      canonical_scopes: https://www.googleapis.com/auth/cloud-platform,
+                        https://www.googleapis.com/auth/trace.readonly
+  - selector: google.devtools.cloudtrace.v1.TraceService.PatchTraces
+    oauth:
+      canonical_scopes: https://www.googleapis.com/auth/cloud-platform,
+                        https://www.googleapis.com/auth/trace.append
diff --git a/google/devtools/remoteexecution/v1test/remote_execution.yaml b/google/devtools/remoteexecution/v1test/remote_execution.yaml
new file mode 100644
index 00000000..61502319
--- /dev/null
+++ b/google/devtools/remoteexecution/v1test/remote_execution.yaml
@@ -0,0 +1,17 @@
+type: google.api.Service
+config_version: 3
+name: remoteexecution.googleapis.com
+title: Remote Execution API
+
+apis:
+- name: google.bytestream.ByteStream
+- name: google.devtools.remoteexecution.v1test.ActionCache
+- name: google.devtools.remoteexecution.v1test.ContentAddressableStorage
+- name: google.devtools.remoteexecution.v1test.Execution
+- name: google.longrunning.Operations
+- name: google.watcher.v1.Watcher
+
+types:
+- name: google.devtools.remoteexecution.v1test.Command
+- name: google.devtools.remoteexecution.v1test.ExecuteResponse
+- name: google.devtools.remoteexecution.v1test.ExecuteOperationMetadata
diff --git a/google/example/library/library.yaml b/google/example/library/library.yaml
new file mode 100644
index 00000000..56c6c021
--- /dev/null
+++ b/google/example/library/library.yaml
@@ -0,0 +1,7 @@
+type: google.api.Service
+config_version: 3
+name: library-example.googleapis.com
+title: Google Example Library API
+
+apis:
+- name: google.example.library.v1.LibraryService
diff --git a/google/example/library/library_gapic.yaml b/google/example/library/library_gapic.yaml
new file mode 100755
index 00000000..777bfd33
--- /dev/null
+++ b/google/example/library/library_gapic.yaml
@@ -0,0 +1,198 @@
+type: com.google.api.codegen.ConfigProto
+license_header:
+  copyright_file: copyright-google.txt
+  license_file: license-header-apache-2.0.txt
+language_settings:
+  java:
+    package_name: com.google.cloud.example.library.spi.v1
+  python:
+    package_name: google.cloud.gapic.example.library.v1
+  go:
+    package_name: cloud.google.com/go/example/library/apiv1
+  csharp:
+    package_name: Google.Example.Library.V1
+  ruby:
+    package_name: Google::Cloud::Example::Library::V1
+  php:
+    package_name: Google\Cloud\Example\Library\V1
+  nodejs:
+    package_name: library.v1
+interfaces:
+- name: google.example.library.v1.LibraryService
+  collections:
+  - name_pattern: shelves/{shelf}
+    entity_name: shelf
+  - name_pattern: shelves/{shelf}/books/{book}
+    entity_name: book
+  retry_codes_def:
+  - name: idempotent
+    retry_codes:
+    - UNAVAILABLE
+    - DEADLINE_EXCEEDED
+  - name: non_idempotent
+    retry_codes: []
+  retry_params_def:
+  - name: default
+    initial_retry_delay_millis: 100
+    retry_delay_multiplier: 1.3
+    max_retry_delay_millis: 60000
+    initial_rpc_timeout_millis: 20000
+    rpc_timeout_multiplier: 1
+    max_rpc_timeout_millis: 20000
+    total_timeout_millis: 600000
+  methods:
+  - name: CreateShelf
+    flattening:
+      groups:
+      - parameters:
+        - shelf
+    required_fields:
+    - shelf
+    request_object_method: false
+    retry_codes_name: non_idempotent
+    retry_params_name: default
+    timeout_millis: 60000
+  - name: GetShelf
+    flattening:
+      groups:
+      - parameters:
+        - name
+    required_fields:
+    - name
+    request_object_method: false
+    retry_codes_name: idempotent
+    retry_params_name: default
+    field_name_patterns:
+      name: shelf
+    timeout_millis: 60000
+  - name: ListShelves
+    request_object_method: true
+    page_streaming:
+      request:
+        page_size_field: page_size
+        token_field: page_token
+      response:
+        token_field: next_page_token
+        resources_field: shelves
+    retry_codes_name: idempotent
+    retry_params_name: default
+    timeout_millis: 60000
+  - name: DeleteShelf
+    flattening:
+      groups:
+      - parameters:
+        - name
+    required_fields:
+    - name
+    request_object_method: false
+    retry_codes_name: idempotent
+    retry_params_name: default
+    field_name_patterns:
+      name: shelf
+    timeout_millis: 60000
+  - name: MergeShelves
+    flattening:
+      groups:
+      - parameters:
+        - name
+        - other_shelf_name
+    required_fields:
+    - name
+    - other_shelf_name
+    request_object_method: true
+    retry_codes_name: non_idempotent
+    retry_params_name: default
+    field_name_patterns:
+      name: shelf
+    timeout_millis: 60000
+  - name: CreateBook
+    flattening:
+      groups:
+      - parameters:
+        - name
+        - book
+    required_fields:
+    - name
+    - book
+    request_object_method: true
+    retry_codes_name: non_idempotent
+    retry_params_name: default
+    field_name_patterns:
+      name: shelf
+    timeout_millis: 60000
+  - name: GetBook
+    flattening:
+      groups:
+      - parameters:
+        - name
+    required_fields:
+    - name
+    request_object_method: false
+    retry_codes_name: idempotent
+    retry_params_name: default
+    field_name_patterns:
+      name: book
+    timeout_millis: 60000
+  - name: ListBooks
+    flattening:
+      groups:
+      - parameters:
+        - name
+    required_fields:
+    - name
+    request_object_method: true
+    page_streaming:
+      request:
+        page_size_field: page_size
+        token_field: page_token
+      response:
+        token_field: next_page_token
+        resources_field: books
+    retry_codes_name: idempotent
+    retry_params_name: default
+    field_name_patterns:
+      name: shelf
+    timeout_millis: 60000
+  - name: DeleteBook
+    flattening:
+      groups:
+      - parameters:
+        - name
+    required_fields:
+    - name
+    request_object_method: false
+    retry_codes_name: idempotent
+    retry_params_name: default
+    field_name_patterns:
+      name: book
+    timeout_millis: 60000
+  - name: UpdateBook
+    flattening:
+      groups:
+      - parameters:
+        - name
+        - book
+    required_fields:
+    - name
+    - book
+    request_object_method: true
+    retry_codes_name: idempotent
+    retry_params_name: default
+    field_name_patterns:
+      name: book
+    timeout_millis: 60000
+  - name: MoveBook
+    flattening:
+      groups:
+      - parameters:
+        - name
+        - other_shelf_name
+    required_fields:
+    - name
+    - other_shelf_name
+    request_object_method: true
+    retry_codes_name: non_idempotent
+    retry_params_name: default
+    field_name_patterns:
+      name: book
+    timeout_millis: 60000
diff --git a/google/rpc/rpc_publish.yaml b/google/rpc/rpc_publish.yaml
new file mode 100644
index 00000000..c85a64df
--- /dev/null
+++ b/google/rpc/rpc_publish.yaml
@@ -0,0 +1,28 @@
+type: google.api.Service
+config_version: 0
+name: rpc.googleapis.com
+title: Google RPC Types
+
+types:
+- name: google.rpc.Status
+- name: google.rpc.RetryInfo
+- name: google.rpc.DebugInfo
+- name: google.rpc.QuotaFailure
+- name: google.rpc.BadRequest
+- name: google.rpc.PreconditionFailure
+- name: google.rpc.RequestInfo
+- name: google.rpc.ResourceInfo
+- name: google.rpc.Help
+- name: google.rpc.LocalizedMessage
+
+enums:
+- name: google.rpc.Code
+
+documentation:
+  summary: Defines RPC types for Stubby services.
+  overview: |-
+    # Google RPC
+
+    This package contains type definitions for general RPC systems. While
+    [gRPC](https://github.com/grpc) is using these defintions, they are not
+    designed specifically to support gRPC.
diff --git a/google/streetview/publish/streetview_publish_gapic.yaml b/google/streetview/publish/streetview_publish_gapic.yaml
new file mode 100644
index 00000000..2cfb16cf
--- /dev/null
+++ b/google/streetview/publish/streetview_publish_gapic.yaml
@@ -0,0 +1,151 @@
+type: com.google.api.codegen.ConfigProto
+language_settings:
+  java:
+    package_name: com.google.streetview.publish.v1
+  python:
+    package_name: google.streetview.publish.v1
+  go:
+    # Seems to match other formats, e.g.
+    # https://github.com/google/google-api-go-client/blob/master/examples/youtube.go
+    package_name: google.golang.org/api/streetviewpublish/v1
+  csharp:
+    package_name: Google.Streetview.Publish.V1
+  ruby:
+    package_name: Google::Streetview::Publish::V1
+  php:
+    package_name: Google\Streetview\Publish\V1
+  nodejs:
+    package_name: google.streetview.publish.v1
+license_header:
+  copyright_file: copyright-google.txt
+  license_file: license-header-apache-2.0.txt
+interfaces:
+- name: google.streetview.publish.v1.StreetViewPublishService
+  smoke_test:
+    method: CreatePhoto
+  collections: []
+  retry_codes_def:
+  - name: idempotent
+    retry_codes:
+    - UNAVAILABLE
+    - DEADLINE_EXCEEDED
+  - name: non_idempotent
+    retry_codes: []
+  retry_params_def:
+  - name: default
+    initial_retry_delay_millis: 100
+    retry_delay_multiplier: 1.3
+    max_retry_delay_millis: 60000
+    initial_rpc_timeout_millis: 20000
+    rpc_timeout_multiplier: 1
+    max_rpc_timeout_millis: 20000
+    total_timeout_millis: 600000
+  methods:
+  - name: StartUpload
+    request_object_method: false
+    retry_codes_name: non_idempotent
+    retry_params_name: default
+    timeout_millis: 60000
+  - name: CreatePhoto
+    flattening:
+      groups:
+      - parameters:
+        - photo
+    required_fields:
+    - photo
+    request_object_method: false
+    retry_codes_name: non_idempotent
+    retry_params_name: default
+    timeout_millis: 60000
+  - name: GetPhoto
+    flattening:
+      groups:
+      - parameters:
+        - photo_id
+        - view
+    required_fields:
+    - photo_id
+    - view
+    request_object_method: true
+    retry_codes_name: idempotent
+    retry_params_name: default
+    timeout_millis: 60000
+  - name: BatchGetPhotos
+    flattening:
+      groups:
+      - parameters:
+        - photo_ids
+        - view
+    required_fields:
+    - photo_ids
+    - view
+    request_object_method: true
+    retry_codes_name: idempotent
+    retry_params_name: default
+    timeout_millis: 60000
+  - name: ListPhotos
+    flattening:
+      groups:
+      - parameters:
+        - view
+        - filter
+    required_fields:
+    - view
+    - filter
+    request_object_method: true
+    page_streaming:
+      request:
+        page_size_field: page_size
+        token_field: page_token
+      response:
+        token_field: next_page_token
+        resources_field: photos
+    retry_codes_name: idempotent
+    retry_params_name: default
+    timeout_millis: 60000
+  - name: UpdatePhoto
+    flattening:
+      groups:
+      - parameters:
+        - photo
+        - update_mask
+    required_fields:
+    - photo
+    - update_mask
+    request_object_method: true
+    retry_codes_name: idempotent
+    retry_params_name: default
+    timeout_millis: 60000
+  - name: BatchUpdatePhotos
+    flattening:
+      groups:
+      - parameters:
+        - update_photo_requests
+    required_fields:
+    - update_photo_requests
+    request_object_method: false
+    retry_codes_name: non_idempotent
+    retry_params_name: default
+    timeout_millis: 60000
+  - name: DeletePhoto
+    flattening:
+      groups:
+      - parameters:
+        - photo_id
+    required_fields:
+    - photo_id
+    request_object_method: false
+    retry_codes_name: idempotent
+    retry_params_name: default
+    timeout_millis: 60000
+  - name: BatchDeletePhotos
+    flattening:
+      groups:
+      - parameters:
+        - photo_ids
+    required_fields:
+    - photo_ids
+    request_object_method: false
+    retry_codes_name: non_idempotent
+    retry_params_name: default
+    timeout_millis: 60000
diff --git a/google/watcher/v1/watcher.yaml b/google/watcher/v1/watcher.yaml
new file mode 100644
index 00000000..61dbfda7
--- /dev/null
+++ b/google/watcher/v1/watcher.yaml
@@ -0,0 +1,7 @@
+type: google.api.Service
+config_version: 3
+name: watcher.googleapis.com
+title: Google Watcher API
+
+apis:
+- name: google.watcher.v1.Watcher