Merge cherrypicks of ['ag/19847187'] into studio-ee-release.

Change-Id: I685db26b0fbca9b2ad61189c824536171b86d2f9
diff --git a/common/version.bzl b/common/version.bzl
index b5316c0..390aa5c 100644
--- a/common/version.bzl
+++ b/common/version.bzl
@@ -1,2 +1,2 @@
-BASE_VERSION = "30.4.0-dev"
-BUILD_VERSION = "7.4.0-dev"
+BASE_VERSION = "30.4.0"
+BUILD_VERSION = "7.4.0"
diff --git a/common/version/com/android/version.properties b/common/version/com/android/version.properties
index 9fb024d..380fc6c 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.4.0-dev
-buildVersion = 7.4.0-dev
-cmdlineToolsVersion = 9.0-dev
+baseVersion = 30.4.0
+buildVersion = 7.4.0
+cmdlineToolsVersion = 9.0
 apiVersion = 3
 nativeApiVersion = 0