diff --git a/.kokoro/release/drop.cfg b/.kokoro/release/drop.cfg
index 220c949ad1..0eeb645725 100644
--- a/.kokoro/release/drop.cfg
+++ b/.kokoro/release/drop.cfg
@@ -4,6 +4,3 @@ env_vars: {
   key: "TRAMPOLINE_BUILD_FILE"
   value: "github/java-bigtable/.kokoro/release/drop.sh"
 }
-
-# Download staging properties file.
-gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/java/releases/java-bigtable"
\ No newline at end of file
diff --git a/.kokoro/release/promote.cfg b/.kokoro/release/promote.cfg
index 60c283ca29..0e93aade6b 100644
--- a/.kokoro/release/promote.cfg
+++ b/.kokoro/release/promote.cfg
@@ -4,7 +4,3 @@ env_vars: {
   key: "TRAMPOLINE_BUILD_FILE"
   value: "github/java-bigtable/.kokoro/release/promote.sh"
 }
-
-# Download staging properties file.
-gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/java/releases/java-bigtable"
-
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 993db6f742..ea7ef9a811 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,27 @@
 # Changelog
 
+## [1.7.0](https://www.github.com/googleapis/java-bigtable/compare/v1.6.0...v1.7.0) (2019-11-07)
+
+
+### Features
+
+* add bom ([#50](https://www.github.com/googleapis/java-bigtable/issues/50)) ([f4dd552](https://www.github.com/googleapis/java-bigtable/commit/f4dd552ea00044babe1273e322b8a330f093b2b0))
+
+
+### Bug Fixes
+
+* align version numbers for proto and grpc versions ([#52](https://www.github.com/googleapis/java-bigtable/issues/52)) ([dbfa73a](https://www.github.com/googleapis/java-bigtable/commit/dbfa73a1a336d0afb03e7755d17786216199a851))
+* fix maven test configs to make sure admin tests don't clobber data tests ([#47](https://www.github.com/googleapis/java-bigtable/issues/47)) ([18576f5](https://www.github.com/googleapis/java-bigtable/commit/18576f55c34dbdc4c0ac79639dbc1dbf1ce7affe))
+* fix regression in batch#close silently ignoring entry failures by upgrading to gax to 1.50.0 ([#67](https://www.github.com/googleapis/java-bigtable/issues/67)) ([5aa8769](https://www.github.com/googleapis/java-bigtable/commit/5aa87697a5e8860993a14f4ac42d675c66b3d0ff))
+* handle recovery failures during stream reframing failure ([#46](https://www.github.com/googleapis/java-bigtable/issues/46)) ([a16cb88](https://www.github.com/googleapis/java-bigtable/commit/a16cb8864c0c8be26d34e71dbf261dbfc5e09bac))
+* Prevent integration tests from different profiles from trampling each other ([#69](https://www.github.com/googleapis/java-bigtable/issues/69)) ([638615a](https://www.github.com/googleapis/java-bigtable/commit/638615ae09ec2d311e82d89ea7a78137911f4eb4))
+* use proper scope for DirectPath transitive dependencies ([#59](https://www.github.com/googleapis/java-bigtable/issues/59)) ([1d1c4de](https://www.github.com/googleapis/java-bigtable/commit/1d1c4deb34a85836da2aed7b07359ff923b09835))
+
+
+### Documentation
+
+* cleanup links to java-bigtable and javadoc ([#56](https://www.github.com/googleapis/java-bigtable/issues/56)) ([846a44f](https://www.github.com/googleapis/java-bigtable/commit/846a44fbf9ebd5691a431e79a09a049aea5fd4f0))
+
 ## [1.6.0](https://www.github.com/googleapis/java-bigtable/compare/1.5.0...v1.6.0) (2019-10-24)
 
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ebbb59e531..48b0fa29b0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -25,4 +25,39 @@ information on using pull requests.
 ## Community Guidelines
 
 This project follows
-[Google's Open Source Community Guidelines](https://opensource.google.com/conduct/).
\ No newline at end of file
+[Google's Open Source Community Guidelines](https://opensource.google.com/conduct/).
+
+
+## Running Tests
+
+Bigtable integration tests can either be run against an emulator or a real Bigtable instance.
+The target environment can be selected by setting a maven profile. By default it is set to 
+`bigtable-emulator-it` and other options are `bigtable-prod-it` and `bigtable-directpath-it`.
+
+To use the `bigtable-prod-it` and `bigtable-directpath-it` environments:
+
+1. Set up the target table using scripts/setup-test-table.sh
+2. Download the JSON service account credentials file from the Google Developer's Console.
+3. Set the environment variable GOOGLE_APPLICATION_CREDENTIALS to the path of the credentials file
+4. Enable the profile and the system properties `bigtable.project`, `bigtable.instance` 
+   and `bigtable.table` to created earlier. Example:
+  ```bash
+   mvn verify \
+  -P bigtable-prod-it \
+  -Dbigtable.project=my-project
+  -Dbigtable.instance=my-instance
+  -Dbigtable.table=my-table
+  ```
+
+While developing, it might be helpful to separate running unit tests from integration tests.
+
+```bash
+# To skip integration tests:
+mvn install -DskipITs
+
+# To skip unit tests
+mvn install -DskipUnitTests
+
+# To skip all tests
+mvn install -DskipTests
+```
\ No newline at end of file
diff --git a/README.md b/README.md
index 024b44f11d..a7a16a6039 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,7 @@ Java idiomatic client for [Cloud Bigtable][cloud-bigtable].
 [![Codacy Badge](https://api.codacy.com/project/badge/grade/9da006ad7c3a4fe1abd142e77c003917)](https://www.codacy.com/app/mziccard/google-cloud-java)
 
 - [Product Documentation][bigtable-product-docs]
-- [Client Library Documentation - Data API](https://googleapis.dev/java/google-cloud-clients/latest/com/google/cloud/bigtable/data/v2/package-summary.html)
-- [Client Library Documentation - Admin API](https://googleapis.dev/java/google-cloud-clients/latest/com/google/cloud/bigtable/admin/v2/package-summary.html)
+- [Client Library Documentation](https://googleapis.dev/java/google-cloud-bigtable/latest/index.html)
 
 ## Quickstart
 
@@ -18,16 +17,16 @@ If you are using Maven, add this to your pom.xml file
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-bigtable</artifactId>
-  <version>1.6.0</version>
+  <version>1.7.0</version>
 </dependency>
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-bigtable:1.6.0'
+compile 'com.google.cloud:google-cloud-bigtable:1.7.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "1.6.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "1.7.0"
 ```
 [//]: # ({x-version-update-end})
 
@@ -162,6 +161,8 @@ try {
 }
 ```
 
+TIP: If you are experiencing version conflicts with gRPC, see [Version Conflicts](#version-conflicts).
+
 ## OpenCensus Tracing
 
 Cloud Bigtable client supports [OpenCensus Tracing](https://opencensus.io/tracing/),
@@ -318,6 +319,33 @@ StackdriverStatsExporter.createAndRegister(
 BigtableDataSettings.enableOpenCensusStats();
 ```
 
+## Version Conflicts
+
+google-cloud-bigtable depends on gRPC directly which may conflict with the versions brought
+in by other libraries, for example Apache Beam. This happens because internal dependencies
+between gRPC libraries are pinned to an exact version of grpc-core
+(see [here](https://github.com/grpc/grpc-java/commit/90db93b990305aa5a8428cf391b55498c7993b6e)).
+If both google-cloud-bigtable and the other library bring in two gRPC libraries that depend
+on the different versions of grpc-core, then dependency resolution will fail.
+The easiest way to fix this is to depend on the gRPC bom, which will force all the gRPC
+transitive libraries to use the same version.
+
+Add the following to your project's pom.xml.
+
+```
+    <dependencyManagement>
+      <dependencies>
+        <dependency>
+          <groupId>io.grpc</groupId>
+          <artifactId>grpc-bom</artifactId>
+          <version>1.24.1</version>
+          <type>pom</type>
+          <scope>import</scope>
+        </dependency>
+      </dependencies>
+    </dependencyManagement>
+```
+
 ## Troubleshooting
 
 To get help, follow the instructions in the [shared Troubleshooting
@@ -335,9 +363,6 @@ Java 7 or above is required for using this client.
 
 This library follows [Semantic Versioning](http://semver.org/).
 
-It is currently in major version zero (`0.y.z`), which means that anything may
-change at any time and the public API should not be considered stable.
-
 ## Contributing
 
 Contributions to this library are always welcome and highly encouraged.
diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml
new file mode 100644
index 0000000000..cc74734ca5
--- /dev/null
+++ b/google-cloud-bigtable-bom/pom.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0"?>
+<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>
+    <groupId>com.google.cloud</groupId>
+    <artifactId>google-cloud-bigtable-bom</artifactId>
+    <version>1.7.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+    <packaging>pom</packaging>
+    <parent>
+        <groupId>com.google.cloud</groupId>
+        <artifactId>google-cloud-shared-config</artifactId>
+        <version>0.2.1</version>
+    </parent>
+
+    <name>Google Cloud Bigtable BOM</name>
+    <url>https://github.com/googleapis/java-bigtable</url>
+    <description>
+        BOM for Google Cloud Bigtable
+    </description>
+
+    <organization>
+        <name>Google LLC</name>
+    </organization>
+
+    <developers>
+        <developer>
+            <id>chingor13</id>
+            <name>Jeff Ching</name>
+            <email>chingor@google.com</email>
+            <organization>Google LLC</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <id>igorberstein</id>
+            <name>Igor Bernstein</name>
+            <email>igorbernstein@google.com</email>
+            <organization>Google LLC</organization>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+    </developers>
+
+    <scm>
+        <connection>scm:git:https://github.com/googleapis/java-bigtable.git</connection>
+        <developerConnection>scm:git:git@github.com:googleapis/java-bigtable.git</developerConnection>
+        <url>https://github.com/googleapis/java-bigtable</url>
+    </scm>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>sonatype-nexus-snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+        <repository>
+            <id>sonatype-nexus-staging</id>
+            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+        </repository>
+    </distributionManagement>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.google.cloud</groupId>
+                <artifactId>google-cloud-bigtable</artifactId>
+                <version>1.7.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+            </dependency>
+            <dependency>
+                <groupId>com.google.cloud</groupId>
+                <artifactId>google-cloud-bigtable-emulator</artifactId>
+                <version>0.116.0</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
+            </dependency>
+            <dependency>
+                <groupId>com.google.api.grpc</groupId>
+                <artifactId>grpc-google-cloud-bigtable-admin-v2</artifactId>
+                <version>1.7.0</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
+            </dependency>
+            <dependency>
+                <groupId>com.google.api.grpc</groupId>
+                <artifactId>grpc-google-cloud-bigtable-v2</artifactId>
+                <version>1.7.0</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
+            </dependency>
+            <dependency>
+                <groupId>com.google.api.grpc</groupId>
+                <artifactId>proto-google-cloud-bigtable-admin-v2</artifactId>
+                <version>1.7.0</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
+            </dependency>
+            <dependency>
+                <groupId>com.google.api.grpc</groupId>
+                <artifactId>proto-google-cloud-bigtable-v2</artifactId>
+                <version>1.7.0</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml
index 00ba8c98be..ede19ae289 100644
--- a/google-cloud-bigtable-emulator/pom.xml
+++ b/google-cloud-bigtable-emulator/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>google-cloud-bigtable-emulator</artifactId>
-  <version>0.115.0</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
+  <version>0.116.0</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
   <name>Google Cloud Java - Bigtable Emulator</name>
   <url>https://github.com/googleapis/java-bigtable</url>
   <description>
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-bigtable-parent</artifactId>
-    <version>1.6.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+    <version>1.7.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
   </parent>
   <scm>
     <connection>scm:git:git@github.com:googleapis/java-bigtable.git</connection>
diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml
index 8d3ae2850a..23c66909d0 100644
--- a/google-cloud-bigtable/pom.xml
+++ b/google-cloud-bigtable/pom.xml
@@ -2,20 +2,25 @@
 <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>google-cloud-bigtable</artifactId>
-  <version>1.6.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+  <version>1.7.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Bigtable</name>
-  <url>https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-bigtable</url>
+  <url>https://github.com/googleapis/java-bigtable</url>
   <description>
     Java idiomatic client for Google Cloud Bigtable.
   </description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-bigtable-parent</artifactId>
-    <version>1.6.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+    <version>1.7.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
   </parent>
   <properties>
     <site.installationModule>google-cloud-bigtable</site.installationModule>
+
+    <!-- Enable the ability to skip unit tests and only run integration tests,
+         while still respecting global skipTests override. -->
+    <skipTests>false</skipTests>
+    <skipUnitTests>${skipTests}</skipUnitTests>
   </properties>
   <dependencies>
     <!-- NOTE: Dependencies are organized into two groups, production and test.
@@ -83,6 +88,16 @@
       <artifactId>grpc-alts</artifactId>
       <scope>runtime</scope>
     </dependency>
+    <!--
+      grpc-stub is needed directly by our tests and transitively by grpc-alts at runtime.
+      So it has to be declared as a direct dependency and to avoid overriding grpc-alts'
+      runtime requirement it has to be promoted to the runtime scope.
+    -->
+    <dependency>
+      <groupId>io.grpc</groupId>
+      <artifactId>grpc-stub</artifactId>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-api</artifactId>
@@ -162,11 +177,6 @@
       <artifactId>truth</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>io.grpc</groupId>
-      <artifactId>grpc-stub</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-testing</artifactId>
@@ -206,9 +216,11 @@
                   <systemPropertyVariables>
                     <bigtable.env>emulator</bigtable.env>
                   </systemPropertyVariables>
-                  <test>com.google.cloud.bigtable.data.v2.it.**</test>
-                  <test>com.google.cloud.bigtable.admin.v2.it.**</test>
+                  <includes>
+                    <include>com.google.cloud.bigtable.**.it.*IT</include>
+                  </includes>
                   <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-emulator-it.xml</summaryFile>
+                  <reportsDirectory>${project.build.directory}/failsafe-reports/emulator-it</reportsDirectory>
                 </configuration>
               </execution>
             </executions>
@@ -232,11 +244,13 @@
                 </goals>
                 <configuration>
                   <systemPropertyVariables>
-                    <bigtable.env>prod</bigtable.env>
+                    <bigtable.env>cloud</bigtable.env>
                   </systemPropertyVariables>
-                  <test>com.google.cloud.bigtable.data.v2.it.**</test>
-                  <test>com.google.cloud.bigtable.admin.v2.it.**</test>
+                  <includes>
+                    <include>com.google.cloud.bigtable.**.it.*IT</include>
+                  </includes>
                   <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-prod-it.xml</summaryFile>
+                  <reportsDirectory>${project.build.directory}/failsafe-reports/prod-it</reportsDirectory>
                 </configuration>
               </execution>
             </executions>
@@ -260,17 +274,25 @@
                 </goals>
                 <configuration>
                   <systemPropertyVariables>
-                    <bigtable.env>prod</bigtable.env>
+                    <bigtable.env>cloud</bigtable.env>
                     <!-- TODO(igorbernstein): This property should be auto set by gax -->
                     <io.grpc.internal.DnsNameResolverProvider.enable_grpclb>true</io.grpc.internal.DnsNameResolverProvider.enable_grpclb>
+
+                    <!-- TODO(igorbernstein): Remove overrides once the prod DirectPath endpoint is available. -->
+                    <!-- Use test env until the prod endpoint is available -->
+                    <bigtable.data-endpoint>testdirectpath-bigtable.sandbox.googleapis.com:443</bigtable.data-endpoint>
+                    <bigtable.admin-endpoint>test-bigtableadmin.sandbox.googleapis.com:443</bigtable.admin-endpoint>
                   </systemPropertyVariables>
                   <!-- Enable directpath for bigtable -->
                   <environmentVariables>
                     <GOOGLE_CLOUD_ENABLE_DIRECT_PATH>bigtable</GOOGLE_CLOUD_ENABLE_DIRECT_PATH>
                   </environmentVariables>
-                  <!-- TODO(igorbernstein): Once the control plane is accessible via directpath, add admin tests -->
-                  <test>com.google.cloud.bigtable.data.v2.it.**</test>
+                  <includes>
+                    <!-- TODO(igorbernstein): Once the control plane is accessible via directpath, add admin tests -->
+                    <include>com.google.cloud.bigtable.data.v2.it.*IT</include>
+                  </includes>
                   <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-directpath-it.xml</summaryFile>
+                  <reportsDirectory>${project.build.directory}/failsafe-reports/directpath-it</reportsDirectory>
                 </configuration>
               </execution>
             </executions>
@@ -313,31 +335,6 @@
         </configuration>
       </plugin>
 
-      <!-- Workaround maven failing to delete old test reports. For some reason, when using the
-        failsafe plugin in profiles, maven retains the counts from previous executions. Causing a
-        stale failure to fail the current test run. -->
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <version>2.5</version>
-        <executions>
-          <execution>
-            <id>clean-old-reports</id>
-            <goals>
-              <goal>clean</goal>
-            </goals>
-            <phase>pre-integration-test</phase>
-            <configuration>
-              <excludeDefaultDirectories>true</excludeDefaultDirectories>
-              <filesets>
-                <fileset>
-                  <directory>${project.build.directory}/failsafe-reports</directory>
-                </fileset>
-              </filesets>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
@@ -369,6 +366,8 @@
         </dependencies>
 
         <configuration>
+          <!-- enable the ability to skip unit tests, while running integration tests -->
+          <skipTests>${skipUnitTests}</skipTests>
           <!--
             TODO(igorbernstein): enable parallel tests once the generate client tests use unique
             names for the mock server
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/MutationApi.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/MutationApi.java
index 8967a573ff..20c7ab2715 100644
--- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/MutationApi.java
+++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/MutationApi.java
@@ -35,6 +35,10 @@ public interface MutationApi<T extends MutationApi<T>> {
    * Adds a mutation which sets the value of the specified cell.
    *
    * <p>This is a convenience override that converts Strings to ByteStrings.
+   *
+   * <p>Note: The timestamp values are in microseconds but must match the granularity of the
+   * table(defaults to `MILLIS`). Therefore, the given value must be a multiple of 1000 (millisecond
+   * granularity). For example: `1571902339435000`.
    */
   T setCell(
       @Nonnull String familyName, @Nonnull String qualifier, long timestamp, @Nonnull String value);
@@ -46,7 +50,13 @@ T setCell(
    */
   T setCell(@Nonnull String familyName, @Nonnull ByteString qualifier, @Nonnull ByteString value);
 
-  /** Adds a mutation which sets the value of the specified cell. */
+  /**
+   * Adds a mutation which sets the value of the specified cell.
+   *
+   * <p>Note: The timestamp values are in microseconds but must match the granularity of the
+   * table(defaults to `MILLIS`). Therefore, the given value must be a multiple of 1000 (millisecond
+   * granularity). For example: `1571902339435000`.
+   */
   T setCell(
       @Nonnull String familyName,
       @Nonnull ByteString qualifier,
@@ -65,6 +75,10 @@ T setCell(
    * Adds a mutation which sets the value of the specified cell.
    *
    * <p>This is a convenience override that converts Strings to ByteStrings.
+   *
+   * <p>Note: The timestamp values are in microseconds but must match the granularity of the
+   * table(defaults to `MILLIS`). Therefore, the given value must be a multiple of 1000 (millisecond
+   * granularity). For example: `1571902339435000`.
    */
   T setCell(@Nonnull String familyName, @Nonnull String qualifier, long timestamp, long value);
 
@@ -75,7 +89,13 @@ T setCell(
    */
   T setCell(@Nonnull String familyName, @Nonnull ByteString qualifier, long value);
 
-  /** Adds a mutation which sets the value of the specified cell. */
+  /**
+   * Adds a mutation which sets the value of the specified cell.
+   *
+   * <p>Note: The timestamp values are in microseconds but must match the granularity of the
+   * table(defaults to `MILLIS`). Therefore, the given value must be a multiple of 1000 (millisecond
+   * granularity). For example: `1571902339435000`.
+   */
   T setCell(@Nonnull String familyName, @Nonnull ByteString qualifier, long timestamp, long value);
 
   /** Adds a mutation which deletes cells from the specified column. */
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserver.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserver.java
index 849c56b193..c46eb55ff9 100644
--- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserver.java
+++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserver.java
@@ -244,7 +244,14 @@ private void deliver() {
       // purposefully leaving the lock non-zero and notifying the outerResponseObserver of the
       // error. Care must be taken to avoid calling close twice in case the first invocation threw
       // an error.
-      innerController.cancel();
+      try {
+        innerController.cancel();
+      } catch (Throwable cancelError) {
+        t.addSuppressed(
+            new IllegalStateException(
+                "Failed to cancel upstream while recovering from an unexpected error",
+                cancelError));
+      }
       if (!finished) {
         outerResponseObserver.onError(t);
       }
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserverTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserverTest.java
index d6c1287d01..426c27f5a3 100644
--- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserverTest.java
+++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserverTest.java
@@ -15,6 +15,7 @@
  */
 package com.google.cloud.bigtable.gaxx.reframing;
 
+import com.google.api.gax.rpc.StreamController;
 import com.google.cloud.bigtable.gaxx.testing.FakeStreamingApi.ServerStreamingStashCallable;
 import com.google.cloud.bigtable.gaxx.testing.FakeStreamingApi.ServerStreamingStashCallable.StreamControllerStash;
 import com.google.cloud.bigtable.gaxx.testing.MockStreamingApi.MockResponseObserver;
@@ -41,6 +42,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
+import org.mockito.Mockito;
 
 @RunWith(JUnit4.class)
 public class ReframingResponseObserverTest {
@@ -374,6 +376,61 @@ public String pop() {
     Truth.assertThat(lastCall.getNumDelivered()).isEqualTo(2);
   }
 
+  /**
+   * Test the scenario where the reframer throws an exception on incoming data and the upstream
+   * throws an exception during cleanup when cancel is called.
+   */
+  @Test
+  public void testFailedRecoveryHandling() {
+    MockResponseObserver<String> outerObserver = new MockResponseObserver<>(true);
+    final RuntimeException fakeReframerError = new RuntimeException("fake reframer error");
+
+    Reframer<String, String> brokenReframer =
+        new Reframer<String, String>() {
+          @Override
+          public void push(String ignored) {
+            throw fakeReframerError;
+          }
+
+          @Override
+          public boolean hasFullFrame() {
+            return false;
+          }
+
+          @Override
+          public boolean hasPartialFrame() {
+            return false;
+          }
+
+          @Override
+          public String pop() {
+            throw new IllegalStateException("should not be called");
+          }
+        };
+    ReframingResponseObserver<String, String> middleware =
+        new ReframingResponseObserver<>(outerObserver, brokenReframer);
+
+    // Configure the mock inner controller to fail cancellation.
+    StreamController mockInnerController = Mockito.mock(StreamController.class);
+    RuntimeException fakeCancelError = new RuntimeException("fake cancel error");
+    Mockito.doThrow(fakeCancelError).when(mockInnerController).cancel();
+
+    // Jumpstart a call & feed it data
+    middleware.onStartImpl(mockInnerController);
+    middleware.onResponseImpl("1");
+
+    // Make sure that the outer observer was notified with the reframer, which contains a suppressed
+    // cancellation error.
+    Throwable finalError = outerObserver.getFinalError();
+    Truth.assertThat(finalError).isSameInstanceAs(fakeReframerError);
+    Truth.assertThat(ImmutableList.of(finalError.getSuppressed())).hasSize(1);
+    Truth.assertThat(finalError.getSuppressed()[0]).isInstanceOf(IllegalStateException.class);
+    Truth.assertThat(finalError.getSuppressed()[0])
+        .hasMessageThat()
+        .isEqualTo("Failed to cancel upstream while recovering from an unexpected error");
+    Truth.assertThat(finalError.getSuppressed()[0].getCause()).isSameInstanceAs(fakeCancelError);
+  }
+
   /**
    * A simple implementation of a {@link Reframer}. The input string is split by dash, and the
    * output is concatenated by dashes. The test can verify M:N behavior by adjusting the
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/ProdEnv.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/CloudEnv.java
similarity index 59%
rename from google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/ProdEnv.java
rename to google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/CloudEnv.java
index 1a610e7c39..b393fdef9a 100644
--- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/ProdEnv.java
+++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/CloudEnv.java
@@ -16,10 +16,14 @@
 package com.google.cloud.bigtable.test_helpers.env;
 
 import com.google.cloud.bigtable.admin.v2.BigtableInstanceAdminClient;
+import com.google.cloud.bigtable.admin.v2.BigtableInstanceAdminSettings;
 import com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient;
+import com.google.cloud.bigtable.admin.v2.BigtableTableAdminSettings;
 import com.google.cloud.bigtable.data.v2.BigtableDataClient;
 import com.google.cloud.bigtable.data.v2.BigtableDataSettings;
+import com.google.common.base.MoreObjects;
 import java.io.IOException;
+import javax.annotation.Nullable;
 
 /**
  * Test environment that uses an existing bigtable table. The table must have a pre-existing family
@@ -31,7 +35,10 @@
  *   <li>{@code bigtable.table}
  * </ul>
  */
-class ProdEnv extends AbstractTestEnv {
+class CloudEnv extends AbstractTestEnv {
+  private static final String DATA_ENDPOINT_PROPERTY_NAME = "bigtable.data-endpoint";
+  private static final String ADMIN_ENDPOINT_PROPERTY_NAME = "bigtable.admin-endpoint";
+
   private static final String PROJECT_PROPERTY_NAME = "bigtable.project";
   private static final String INSTANCE_PROPERTY_NAME = "bigtable.instance";
   private static final String TABLE_PROPERTY_NAME = "bigtable.table";
@@ -40,37 +47,60 @@ class ProdEnv extends AbstractTestEnv {
   private final String instanceId;
   private final String tableId;
 
-  private final BigtableDataSettings dataSettings;
+  private final BigtableDataSettings.Builder dataSettings;
+  private final BigtableTableAdminSettings.Builder tableAdminSettings;
+  private final BigtableInstanceAdminSettings.Builder instanceAdminSettings;
 
   private BigtableDataClient dataClient;
   private BigtableTableAdminClient tableAdminClient;
   private BigtableInstanceAdminClient instanceAdminClient;
 
-  static ProdEnv fromSystemProperties() {
-    return new ProdEnv(
+  static CloudEnv fromSystemProperties() {
+    return new CloudEnv(
+        getOptionalProperty(DATA_ENDPOINT_PROPERTY_NAME, "bigtable.googleapis.com:443"),
+        getOptionalProperty(ADMIN_ENDPOINT_PROPERTY_NAME, "bigtableadmin.googleapis.com:443"),
         getRequiredProperty(PROJECT_PROPERTY_NAME),
         getRequiredProperty(INSTANCE_PROPERTY_NAME),
         getRequiredProperty(TABLE_PROPERTY_NAME));
   }
 
-  private ProdEnv(String projectId, String instanceId, String tableId) {
+  private CloudEnv(
+      @Nullable String dataEndpoint,
+      @Nullable String adminEndpoint,
+      String projectId,
+      String instanceId,
+      String tableId) {
     this.projectId = projectId;
     this.instanceId = instanceId;
     this.tableId = tableId;
 
     this.dataSettings =
-        BigtableDataSettings.newBuilder().setProjectId(projectId).setInstanceId(instanceId).build();
+        BigtableDataSettings.newBuilder().setProjectId(projectId).setInstanceId(instanceId);
+    if (dataEndpoint != null) {
+      dataSettings.stubSettings().setEndpoint(dataEndpoint);
+    }
+
+    this.tableAdminSettings =
+        BigtableTableAdminSettings.newBuilder().setProjectId(projectId).setInstanceId(instanceId);
+    if (adminEndpoint != null) {
+      this.tableAdminSettings.stubSettings().setEndpoint(adminEndpoint);
+    }
+
+    this.instanceAdminSettings = BigtableInstanceAdminSettings.newBuilder().setProjectId(projectId);
+    if (adminEndpoint != null) {
+      this.instanceAdminSettings.stubSettings().setEndpoint(adminEndpoint);
+    }
   }
 
   @Override
   void start() throws IOException {
-    dataClient = BigtableDataClient.create(dataSettings);
-    tableAdminClient = BigtableTableAdminClient.create(projectId, instanceId);
-    instanceAdminClient = BigtableInstanceAdminClient.create(projectId);
+    dataClient = BigtableDataClient.create(dataSettings.build());
+    tableAdminClient = BigtableTableAdminClient.create(tableAdminSettings.build());
+    instanceAdminClient = BigtableInstanceAdminClient.create(instanceAdminSettings.build());
   }
 
   @Override
-  void stop() throws Exception {
+  void stop() {
     dataClient.close();
     tableAdminClient.close();
     instanceAdminClient.close();
@@ -93,7 +123,7 @@ public BigtableInstanceAdminClient getInstanceAdminClient() {
 
   @Override
   public BigtableDataSettings getDataClientSettings() {
-    return dataSettings;
+    return dataSettings.build();
   }
 
   @Override
@@ -111,6 +141,10 @@ public String getTableId() {
     return tableId;
   }
 
+  private static String getOptionalProperty(String prop, String defaultValue) {
+    return MoreObjects.firstNonNull(System.getProperty(prop), defaultValue);
+  }
+
   private static String getRequiredProperty(String prop) {
     String value = System.getProperty(prop);
     if (value == null || value.isEmpty()) {
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/TestEnvRule.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/TestEnvRule.java
index 293f8b47e7..1905f14a16 100644
--- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/TestEnvRule.java
+++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/TestEnvRule.java
@@ -30,9 +30,9 @@
  * <ul>
  *   <li>{@code emulator}: uses the cbtemulator component that can be installed by gcloud
  *   <li>{@code prod}: uses a pre-existing production table. The target table is defined using
- *       system properties listed in {@link ProdEnv} and application default credentials
+ *       system properties listed in {@link CloudEnv} and application default credentials
  *   <li>{@code direct_path}: uses a pre-existing table in the direct path test environment. The
- *       target table is defined using system properties listed in {@link ProdEnv} and application
+ *       target table is defined using system properties listed in {@link CloudEnv} and application
  *       default credentials
  * </ul>
  *
@@ -60,8 +60,8 @@ protected void before() throws Throwable {
       case "emulator":
         testEnv = EmulatorEnv.createBundled();
         break;
-      case "prod":
-        testEnv = ProdEnv.fromSystemProperties();
+      case "cloud":
+        testEnv = CloudEnv.fromSystemProperties();
         break;
       default:
         throw new IllegalArgumentException(
diff --git a/grpc-google-cloud-bigtable-admin-v2/pom.xml b/grpc-google-cloud-bigtable-admin-v2/pom.xml
index 8076d16f6f..62a4a0d285 100644
--- a/grpc-google-cloud-bigtable-admin-v2/pom.xml
+++ b/grpc-google-cloud-bigtable-admin-v2/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>grpc-google-cloud-bigtable-admin-v2</artifactId>
-  <version>0.82.0</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
+  <version>1.7.0</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
   <name>grpc-google-cloud-bigtable-admin-v2</name>
   <description>GRPC library for grpc-google-cloud-bigtable-admin-v2</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-bigtable-parent</artifactId>
-    <version>1.6.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+    <version>1.7.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/grpc-google-cloud-bigtable-v2/pom.xml b/grpc-google-cloud-bigtable-v2/pom.xml
index 4de12ea8d2..1ebb1045cf 100644
--- a/grpc-google-cloud-bigtable-v2/pom.xml
+++ b/grpc-google-cloud-bigtable-v2/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>grpc-google-cloud-bigtable-v2</artifactId>
-  <version>0.82.0</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
+  <version>1.7.0</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
   <name>grpc-google-cloud-bigtable-v2</name>
   <description>GRPC library for grpc-google-cloud-bigtable-v2</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-bigtable-parent</artifactId>
-    <version>1.6.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+    <version>1.7.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/pom.xml b/pom.xml
index a35bf6d68c..2378b96b63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <artifactId>google-cloud-bigtable-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.6.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+    <version>1.7.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
     <name>Google Cloud Bigtable Parent</name>
     <url>https://github.com/googleapis/java-bigtable</url>
     <description>
@@ -154,11 +154,12 @@
         <project.javadoc.protobufBaseURL>https://googleapis.dev/java/google-api-grpc/latest</project.javadoc.protobufBaseURL>
 
         <autovalue.version>1.7</autovalue.version>
-        <gax.version>1.49.1</gax.version>
+        <gax.version>1.50.0</gax.version>
         <google.api-common.version>1.8.1</google.api-common.version>
         <google.common-protos.version>1.17.0</google.common-protos.version>
         <google.core.version>1.91.3</google.core.version>
-        <grpc.version>1.24.1</grpc.version>
+         <!-- make sure to update the grpc version in README -->
+        <grpc.version>1.25.0</grpc.version>
         <guava.version>28.1-android</guava.version>
         <opencensus.version>0.24.0</opencensus.version>
         <protobuf.version>3.10.0</protobuf.version>
@@ -194,27 +195,27 @@
             <dependency>
               <groupId>com.google.cloud</groupId>
               <artifactId>google-cloud-bigtable-emulator</artifactId>
-              <version>0.115.0</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
+              <version>0.116.0</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
             </dependency>
             <dependency>
               <groupId>com.google.api.grpc</groupId>
               <artifactId>grpc-google-cloud-bigtable-admin-v2</artifactId>
-              <version>0.82.0</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
+              <version>1.7.0</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
             </dependency>
             <dependency>
               <groupId>com.google.api.grpc</groupId>
               <artifactId>grpc-google-cloud-bigtable-v2</artifactId>
-              <version>0.82.0</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
+              <version>1.7.0</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
             </dependency>
             <dependency>
               <groupId>com.google.api.grpc</groupId>
               <artifactId>proto-google-cloud-bigtable-admin-v2</artifactId>
-              <version>0.82.0</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
+              <version>1.7.0</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
             </dependency>
             <dependency>
               <groupId>com.google.api.grpc</groupId>
               <artifactId>proto-google-cloud-bigtable-v2</artifactId>
-              <version>0.82.0</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
+              <version>1.7.0</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
             </dependency>
 
             <!-- Production dependency version definitions in alphabetical order -->
@@ -380,6 +381,7 @@
         <module>grpc-google-cloud-bigtable-admin-v2</module>
         <module>google-cloud-bigtable</module>
         <module>google-cloud-bigtable-emulator</module>
+        <module>google-cloud-bigtable-bom</module>
     </modules>
 
     <reporting>
diff --git a/proto-google-cloud-bigtable-admin-v2/pom.xml b/proto-google-cloud-bigtable-admin-v2/pom.xml
index be1244d80f..23476197cc 100644
--- a/proto-google-cloud-bigtable-admin-v2/pom.xml
+++ b/proto-google-cloud-bigtable-admin-v2/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>proto-google-cloud-bigtable-admin-v2</artifactId>
-  <version>0.82.0</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
+  <version>1.7.0</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
   <name>proto-google-cloud-bigtable-admin-v2</name>
   <description>PROTO library for proto-google-cloud-bigtable-admin-v2</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-bigtable-parent</artifactId>
-    <version>1.6.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+    <version>1.7.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/proto-google-cloud-bigtable-v2/pom.xml b/proto-google-cloud-bigtable-v2/pom.xml
index f86dd1be57..4d404e0162 100644
--- a/proto-google-cloud-bigtable-v2/pom.xml
+++ b/proto-google-cloud-bigtable-v2/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>proto-google-cloud-bigtable-v2</artifactId>
-  <version>0.82.0</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
+  <version>1.7.0</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
   <name>proto-google-cloud-bigtable-v2</name>
   <description>PROTO library for proto-google-cloud-bigtable-v2</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-bigtable-parent</artifactId>
-    <version>1.6.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+    <version>1.7.0</version><!-- {x-version-update:google-cloud-bigtable:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/google-cloud-bigtable/scripts/setup-test-table.sh b/scripts/setup-test-table.sh
similarity index 74%
rename from google-cloud-bigtable/scripts/setup-test-table.sh
rename to scripts/setup-test-table.sh
index 6321c1154c..c8bb1e2a62 100755
--- a/google-cloud-bigtable/scripts/setup-test-table.sh
+++ b/scripts/setup-test-table.sh
@@ -36,13 +36,7 @@ for ADMIN_HOST in "${ADMIN_HOSTS[@]}"; do
   fi
 
   # Ensure that the table exists
-  if ! call_cbt -instance ${INSTANCE_ID} ls | grep -q "^${TABLE_ID}\$"; then
-    call_cbt createtable ${TABLE_ID}
-  fi
-
-  # Ensure that the family exists
-  if ! call_cbt ls "${TABLE_ID}" | grep -q "^$FAMILY\b"; then
-    call_cbt createfamily "${TABLE_ID}" "${FAMILY}"
-    call_cbt setgcpolicy "${TABLE_ID}" "${FAMILY}" maxversions=1 maxage=1h
+  if ! call_cbt -instance "$INSTANCE_ID" ls | grep -q "^${TABLE_ID}\$"; then
+    call_cbt createtable "$TABLE_ID" "families=$FAMILY:maxversions=1||maxage=1h"
   fi
 done
diff --git a/synth.metadata b/synth.metadata
index 2071b47d87..3b7fe802cc 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -1,19 +1,19 @@
 {
-  "updateTime": "2019-10-23T07:53:18.358413Z",
+  "updateTime": "2019-10-26T07:53:02.643440Z",
   "sources": [
     {
       "generator": {
         "name": "artman",
-        "version": "0.40.2",
-        "dockerImage": "googleapis/artman@sha256:3b8f7d9b4c206843ce08053474f5c64ae4d388ff7d995e68b59fb65edf73eeb9"
+        "version": "0.40.3",
+        "dockerImage": "googleapis/artman@sha256:c805f50525f5f557886c94ab76f56eaa09cb1da58c3ee95111fd34259376621a"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "0d0dc5172f16c9815a5eda6e99408fb96282f608",
-        "internalRef": "276178557"
+        "sha": "d27a44798506d28e8e6d874bd128da43f45f74c4",
+        "internalRef": "276716410"
       }
     },
     {
diff --git a/versions.txt b/versions.txt
index 91d60a313b..9bc4b483e2 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-bigtable:1.6.0:1.6.0
-grpc-google-cloud-bigtable-admin-v2:0.82.0:0.82.0
-grpc-google-cloud-bigtable-v2:0.82.0:0.82.0
-proto-google-cloud-bigtable-admin-v2:0.82.0:0.82.0
-proto-google-cloud-bigtable-v2:0.82.0:0.82.0
-google-cloud-bigtable-emulator:0.115.0:0.115.0
+google-cloud-bigtable:1.7.0:1.7.0
+grpc-google-cloud-bigtable-admin-v2:1.7.0:1.7.0
+grpc-google-cloud-bigtable-v2:1.7.0:1.7.0
+proto-google-cloud-bigtable-admin-v2:1.7.0:1.7.0
+proto-google-cloud-bigtable-v2:1.7.0:1.7.0
+google-cloud-bigtable-emulator:0.116.0:0.116.0