Merge cherrypicks of [16492169, 16492171] into studio-chipmunk-release.

Change-Id: I6f4c7e6fb01457561307c6b6e59aa3e20dff21d6
diff --git a/common/version.bzl b/common/version.bzl
index 0e8f031..bbe426e 100644
--- a/common/version.bzl
+++ b/common/version.bzl
@@ -1,2 +1,2 @@
-BASE_VERSION = "30.2.0-dev"
-BUILD_VERSION = "7.2.0-dev"
+BASE_VERSION = "30.2.1"
+BUILD_VERSION = "7.2.1"
diff --git a/common/version/com/android/version.properties b/common/version/com/android/version.properties
index 6612996..8709cc3 100644
--- a/common/version/com/android/version.properties
+++ b/common/version/com/android/version.properties
@@ -1,8 +1,8 @@
 # The source of truth for these values are in tools/buildSrc/base
 # Consistency is maintained via tests
 
-baseVersion = 30.2.0-dev
-buildVersion = 7.2.0-dev
-cmdlineToolsVersion = 3.0-dev
+baseVersion = 30.2.1
+buildVersion = 7.2.1
+cmdlineToolsVersion = 7.0
 apiVersion = 3
 nativeApiVersion = 0