Merge from master; Resolve conflicts

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,51 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+Thanks for stopping by to let us know something could be better!
+
+**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response.
+
+Please run down the following list and make sure you've tried the usual "quick fixes":
+
+  - Search the issues already opened: https://github.com/googleapis/google-cloud-java/issues
+  - Check for answers on StackOverflow: http://stackoverflow.com/questions/tagged/google-cloud-platform
+
+If you are still having issues, please be sure to include as much information as possible:
+
+#### Environment details
+
+1. Specify the API at the beginning of the title (for example, "BigQuery: ...")
+   General, Core, and Other are also allowed as types
+2. OS type and version:
+3. Java version:
+4. google-cloud-java version(s):
+
+#### Steps to reproduce
+
+  1. ?
+  2. ? 
+
+#### Code example
+
+```java
+// example
+```
+
+#### Stack trace
+```
+Any relevant stacktrace here.
+```
+
+#### External references such as API reference guides used	
+
+- ?	
+
+#### Any additional information below	
+
+
+Making sure to follow these steps will guarantee the quickest resolution possible.
+
+Thanks!

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,18 @@
+---
+name: Feature request
+about: Suggest an idea for this library
+
+---
+
+Thanks for stopping by to let us know something could be better!
+
+**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response.
+
+ **Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+ **Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+ **Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+ **Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/support_request.md

@@ -0,0 +1,7 @@
+---
+name: Support request
+about: If you have a support contract with Google, please create an issue in the Google Cloud Support console.
+
+---
+
+**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response.

.kokoro/continuous/bigtableadmin-it.cfg → .kokoro/continuous/kms-it.cfg

@@ -8,7 +8,7 @@ env_vars: {
 
 env_vars: {
     key: "INTEGRATION_TEST_ARGS"
-    value: "google-cloud-clients/google-cloud-bigtable -Dbigtable.env=prod -Dbigtable.project=gcloud-devel -Dbigtable.instance=google-cloud-bigtable -Dbigtable.table=integration-tests"
+    value: "google-cloud-clients/google-cloud-kms"
 }
 
 env_vars: {

.kokoro/nightly/bigtableadmin-it.cfg → .kokoro/nightly/kms-it.cfg

@@ -8,7 +8,7 @@ env_vars: {
 
 env_vars: {
     key: "INTEGRATION_TEST_ARGS"
-    value: "google-cloud-clients/google-cloud-bigtable -Dbigtable.env=prod -Dbigtable.project=gcloud-devel -Dbigtable.instance=google-cloud-bigtable -Dbigtable.table=integration-tests"
+    value: "google-cloud-clients/google-cloud-kms"
 }
 
 env_vars: {

.kokoro/presubmit/bigtableadmin-it.cfg → .kokoro/presubmit/kms-it.cfg

@@ -8,7 +8,7 @@ env_vars: {
 
 env_vars: {
     key: "INTEGRATION_TEST_ARGS"
-    value: "google-cloud-clients/google-cloud-bigtable -Dbigtable.env=prod -Dbigtable.project=gcloud-devel -Dbigtable.instance=google-cloud-bigtable -Dbigtable.table=integration-tests"
+    value: "google-cloud-clients/google-cloud-kms"
 }
 
 env_vars: {

CONTRIBUTING.md

@@ -54,6 +54,7 @@ Coding Style
 Maintain the coding style in the project and in particular the modified files.
 Follow the Google Java [style](https://google.github.io/styleguide/javaguide.html).
 
+In pull requests, please run `mvn com.coveo:fmt-maven-plugin:format` to format your code diff.
 
 ## Contributor License Agreements
 

README.md

@@ -43,6 +43,7 @@ This library supports the following Google Cloud Platform services with clients
 
 -  [Cloud Bigtable](google-cloud-clients/google-cloud-bigtable) (Alpha)
 -  [Cloud Compute](google-cloud-clients/google-cloud-compute) (Alpha)
+-  [Cloud Data Labeling](google-cloud-clients/google-cloud-datalabeling) (Alpha)
 -  [Cloud Dataproc](google-cloud-clients/google-cloud-dataproc) (Alpha)
 -  [Cloud DNS](google-cloud-clients/google-cloud-dns) (Alpha)
 -  [Cloud OS Login](google-cloud-clients/google-cloud-os-login) (Alpha)
@@ -66,7 +67,7 @@ If you are using Maven, add this to your pom.xml file
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-bom</artifactId>
-        <version>0.80.0-alpha</version>
+        <version>0.87.0-alpha</version>
         <type>pom</type>
         <scope>import</scope>
        </dependency>
@@ -85,11 +86,11 @@ If you are using Maven, add this to your pom.xml file
 [//]: # ({x-version-update-start:google-cloud-storage:released})
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-storage:1.62.0'
+compile 'com.google.cloud:google-cloud-storage:1.69.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "1.62.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "1.69.0"
 ```
 [//]: # ({x-version-update-end})
 
@@ -110,7 +111,7 @@ If you are running into problems with version conflicts, the easiest way to solv
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-bom</artifactId>
-        <version>0.80.0-alpha</version>
+        <version>0.87.0-alpha</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

google-api-grpc/grpc-google-cloud-asset-v1/pom.xml

@@ -0,0 +1,31 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>grpc-google-cloud-asset-v1</artifactId>
+    <version>0.52.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-asset-v1:current} -->
+    <name>grpc-google-cloud-asset-v1</name>
+    <description>GRPC library for grpc-google-cloud-asset-v1</description>
+    <parent>
+        <groupId>com.google.api.grpc</groupId>
+        <artifactId>google-api-grpc</artifactId>
+        <version>0.52.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc:current} -->
+    </parent>
+    <dependencies>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-stub</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-protobuf</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.api.grpc</groupId>
+            <artifactId>proto-google-cloud-asset-v1</artifactId>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+</project>