Merge cherrypicks of [6905455, 6905456, 6905457, 6905458, 6905459] into studio-3.4-release
Change-Id: I08e29995d7b6a90d7fb9c237b5ef0dd87e934bf9
diff --git a/base/version.properties b/base/version.properties
index 80ba434..7e152d9 100644
--- a/base/version.properties
+++ b/base/version.properties
@@ -3,8 +3,8 @@
# This file is read by gradle build scripts, but also packaged with builder and
# builder-model as a resource, for Version classes to read.
-baseVersion = 26.4.0-rc03
-buildVersion = 3.4.0-rc03
+baseVersion = 26.4.0
+buildVersion = 3.4.0
# This counter should be incremented every time the api is changed in not backward-compatible way,
# i.e. it should be incremented from N to N+1 only when the api is changed in a way that existing
