diff --git a/annotations/build.gradle b/annotations/build.gradle
index 6071820..195a0e7 100644
--- a/annotations/build.gradle
+++ b/annotations/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'java'
-archivesBaseName = 'support-annotations'
 
 sourceSets {
     main.java.srcDir 'src'
diff --git a/buildSrc/init.gradle b/buildSrc/init.gradle
index 2cde002..77b086e 100644
--- a/buildSrc/init.gradle
+++ b/buildSrc/init.gradle
@@ -92,7 +92,7 @@
 
 def setupRepoOutAndBuildNumber() {
     ext.supportRepoOut = ''
-    ext.buildNumber = Integer.toString(ext.extraVersion)
+    ext.buildNumber = "0"
 
     /*
      * With the build server you are given two env variables.
@@ -163,7 +163,6 @@
             return
         }
 
-        // Current SDK is set in studioCompat.gradle.
         project.ext.currentSdk = gradle.ext.currentSdk
         apply plugin: 'maven'
 
@@ -199,7 +198,7 @@
                             exclude "**/R\$*.class"
                             exclude "**/BuildConfig.class"
                             destinationDir file(project.distDir)
-                            archiveName "${project.archivesBaseName}-${v.baseName}-allclasses.jar"
+                            archiveName "${project.name}-${v.baseName}-allclasses.jar"
                         }
 
                         def collectJacocoAntPackages = project.tasks.create(
@@ -268,7 +267,6 @@
                     // Make the mainupload depend on this one.
                     mainUpload.dependsOn uploadTask
                 }
-
             }
         }
 
@@ -320,15 +318,6 @@
             }
         }
 
-        project.afterEvaluate {
-            // The archivesBaseName isn't available initially, so set it now
-            def createZipTask = project.tasks.findByName("createSeparateZip")
-            if (createZipTask != null) {
-                createZipTask.appendix = archivesBaseName
-                createZipTask.from versionDir()
-            }
-        }
-
         project.afterEvaluate { p ->
             // remove dependency on the test so that we still get coverage even if some tests fail
             p.tasks.findAll { it instanceof JacocoReportTask }.each { task ->
diff --git a/buildSrc/release.gradle b/buildSrc/release.gradle
index 5126d47..5033454 100644
--- a/buildSrc/release.gradle
+++ b/buildSrc/release.gradle
@@ -13,34 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import com.google.common.base.Charsets
-import com.google.common.io.Files
-import com.google.common.hash.HashCode
-import com.google.common.hash.HashFunction
-import com.google.common.hash.Hashing
-import java.nio.charset.Charset
 
-// Main task called by the build server.
-task(createArchive)
-
-// upload anchor for subprojects to upload their artifacts
-// to the local repo.
+// upload anchor for subprojects to upload their artifacts to the local repo.
 task(mainUpload)
 
-rootProject.ext.repoWithHistoryOut = new File(buildDir, 'support_repo_with_history')
-
-// repository creation task
-task createRepository(type: Zip, dependsOn: mainUpload) {
-    from rootProject.ext.supportRepoOut
-    from "${repos.prebuiltsRoot}/maven_repo/android"
-    // if there are duplicates, pick the first one.
-    duplicatesStrategy "EXCLUDE"
-    destinationDir project.ext.distDir
-    into 'm2repository'
-    baseName = String.format("sdk-repo-linux-m2repository-%s", project.ext.buildNumber)
-}
-
-task createTopOfTreeRepository(type : Zip) {
+task createArchive(type : Zip) {
     description "Creates a maven repository that includes just the libraries compiled in this" +
             " project, without any history from prebuilts."
     from rootProject.ext.supportRepoOut
@@ -50,11 +27,8 @@
     dependsOn mainUpload
 }
 
-createArchive.dependsOn createRepository
-createRepository.dependsOn createTopOfTreeRepository
-
-// anchor for prepare repo. This is post unzip + sourceProp.
-task nukeRepoOut() {
+// anchor for prepare repo. This is post unzip.
+task prepareRepo() {
     description "This task clears the repo folder to ensure that we run a fresh build every" +
             " time we create arhives. Otherwise, snapshots will accumulate in the builds folder."
     doFirst {
@@ -62,64 +36,3 @@
         rootProject.ext.supportRepoOut.mkdirs()
     }
 }
-
-task(prepareRepo)
-
-task(createXml).doLast({
-    def repoArchive = createRepository.archivePath
-    def repoArchiveName = createRepository.archiveName
-    def size = repoArchive.length()
-    def sha1 = getSha1(repoArchive)
-
-    def xml =
-            "<sdk:sdk-addon xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:sdk=\"http://schemas.android.com/sdk/android/addon/6\">\n\
-  <sdk:extra>\n\
-    <sdk:revision>\n\
-      <sdk:major>${project.ext.extraVersion}</sdk:major>\n\
-    </sdk:revision>\n\
-    <sdk:vendor-display>Android</sdk:vendor-display>\n\
-    <sdk:vendor-id>android</sdk:vendor-id>\n\
-    <sdk:name-display>Local Maven repository for Support Libraries</sdk:name-display>\n\
-    <sdk:path>m2repository</sdk:path>\n\
-    <sdk:archives>\n\
-      <sdk:archive>\n\
-       <sdk:size>${size}</sdk:size>\n\
-       <sdk:checksum type=\"sha1\">${sha1}</sdk:checksum>\n\
-       <sdk:url>${repoArchiveName}</sdk:url>\n\
-      </sdk:archive>\n\
-    </sdk:archives>\n\
-  </sdk:extra>\n\
-</sdk:sdk-addon>"
-
-    Files.write(xml, new File(project.ext.distDir, 'repo-extras.xml'), Charsets.UTF_8)
-})
-createArchive.dependsOn createXml
-createXml.dependsOn createRepository
-
-task(createSourceProp).doLast({
-    def sourceProp =
-            "Extra.VendorDisplay=Android\n\
-Extra.Path=m2repository\n\
-Archive.Arch=ANY\n\
-Extra.NameDisplay=Android Support Repository\n\
-Archive.Os=ANY\n\
-Pkg.Desc=Local Maven repository for Support Libraries\n\
-Pkg.Revision=${project.ext.extraVersion}.0.0\n\
-Extra.VendorId=android"
-
-    Files.write(sourceProp, new File(project.ext.supportRepoOut, 'source.properties'), Charsets.UTF_8)
-})
-createSourceProp.dependsOn nukeRepoOut
-prepareRepo.dependsOn createSourceProp
-
-/**
- * Generates SHA1 hash for the specified file's absolute path.
- *
- * @param inputFile file to hash
- * @return SHA1 hash
- */
-String getSha1(File inputFile) {
-    HashFunction hashFunction = Hashing.sha1()
-    HashCode hashCode = hashFunction.hashString(inputFile.getAbsolutePath(), Charset.forName("UTF-8"))
-    return hashCode.toString()
-}
diff --git a/buildSrc/versions.gradle b/buildSrc/versions.gradle
index 5814016..d017e79 100644
--- a/buildSrc/versions.gradle
+++ b/buildSrc/versions.gradle
@@ -13,15 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// Prevent the Android Gradle plug-in from automatically downloading SDK dependencies.
-ext['android.builder.sdkDownload'] = false
 
 // Version code of the support library components.
 ext.supportVersion = "26.0.0-SNAPSHOT"
 
-// This number gets incremented for each public release.
-ext.extraVersion = 46
-
 // Enforce the use of prebuilt dependencies in all sub-projects. This is
 // required for the doclava dependency.
 ext.usePrebuilts = "true"
diff --git a/compat/build.gradle b/compat/build.gradle
index 7724a29..d4abaf0 100644
--- a/compat/build.gradle
+++ b/compat/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'support-compat'
 
 dependencies {
     compile project(':support-annotations')
diff --git a/core-ui/build.gradle b/core-ui/build.gradle
index 2cd1806..d7ae917 100644
--- a/core-ui/build.gradle
+++ b/core-ui/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'support-core-ui'
 
 dependencies {
     compile project(':support-annotations')
diff --git a/core-utils/build.gradle b/core-utils/build.gradle
index 380f1f6..d7719dd 100644
--- a/core-utils/build.gradle
+++ b/core-utils/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'support-core-utils'
 
 dependencies {
     compile project(':support-annotations')
diff --git a/customtabs/build.gradle b/customtabs/build.gradle
index 6bc7dd5..b623b16 100644
--- a/customtabs/build.gradle
+++ b/customtabs/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'customtabs'
 
 dependencies {
     compile project(':support-compat')
diff --git a/design/build.gradle b/design/build.gradle
index d76642d..409a233 100644
--- a/design/build.gradle
+++ b/design/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'design'
 
 dependencies {
     compile project(':support-v4')
diff --git a/dynamic-animation/build.gradle b/dynamic-animation/build.gradle
index 49cfbfc..75f85c7 100644
--- a/dynamic-animation/build.gradle
+++ b/dynamic-animation/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'support-dynamic-animation'
 
 dependencies {
     compile project(':support-core-utils')
diff --git a/emoji/appcompat/build.gradle b/emoji/appcompat/build.gradle
index 42cba1e..d3af26b 100644
--- a/emoji/appcompat/build.gradle
+++ b/emoji/appcompat/build.gradle
@@ -15,7 +15,6 @@
  */
 
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'support-emoji-appcompat'
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
diff --git a/emoji/bundled/build.gradle b/emoji/bundled/build.gradle
index 05fb17f..e0ed3d8 100644
--- a/emoji/bundled/build.gradle
+++ b/emoji/bundled/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'support-emoji-bundled'
 
 ext {
     fontDir = project(':noto-emoji-compat').projectDir
diff --git a/emoji/core/build.gradle b/emoji/core/build.gradle
index c9f29dc3..ed21cfa 100644
--- a/emoji/core/build.gradle
+++ b/emoji/core/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'support-emoji'
 
 ext {
     fontDir = project(':noto-emoji-compat').projectDir
diff --git a/exifinterface/build.gradle b/exifinterface/build.gradle
index 583ed93..e381df8 100644
--- a/exifinterface/build.gradle
+++ b/exifinterface/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'exifinterface'
 
 dependencies {
     compile project(':support-annotations')
diff --git a/fragment/build.gradle b/fragment/build.gradle
index 79921a2..3a3ed22 100644
--- a/fragment/build.gradle
+++ b/fragment/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'support-fragment'
 
 dependencies {
     compile project(':support-compat')
diff --git a/gradle.properties b/gradle.properties
index b8e17ca..833f6ed 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,3 +4,4 @@
 org.gradle.parallel=true
 org.gradle.caching=true
 android.useDexArchive=false
+android.builder.sdkDownload=false
diff --git a/graphics/drawable/animated/build.gradle b/graphics/drawable/animated/build.gradle
index 00a3688..79379f0 100644
--- a/graphics/drawable/animated/build.gradle
+++ b/graphics/drawable/animated/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'animated-vector-drawable'
 
 dependencies {
     compile project(':support-vector-drawable')
diff --git a/graphics/drawable/static/build.gradle b/graphics/drawable/static/build.gradle
index 996a855..3a15746 100644
--- a/graphics/drawable/static/build.gradle
+++ b/graphics/drawable/static/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'support-vector-drawable'
 
 dependencies {
     compile project(':support-annotations')
diff --git a/media-compat/build.gradle b/media-compat/build.gradle
index 9d28f80..f401461 100644
--- a/media-compat/build.gradle
+++ b/media-compat/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'support-media-compat'
 
 dependencies {
     compile project(':support-annotations')
diff --git a/percent/build.gradle b/percent/build.gradle
index 90c2962..b3a526e 100644
--- a/percent/build.gradle
+++ b/percent/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'percent'
 
 dependencies {
     compile project(':support-compat')
diff --git a/recommendation/build.gradle b/recommendation/build.gradle
index 9becae9..2da9878 100644
--- a/recommendation/build.gradle
+++ b/recommendation/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'recommendation'
 
 dependencies {
     compile project(':support-v4')
diff --git a/transition/build.gradle b/transition/build.gradle
index decde29..bb20945 100644
--- a/transition/build.gradle
+++ b/transition/build.gradle
@@ -1,7 +1,5 @@
 apply plugin: android.support.SupportLibraryPlugin
 
-archivesBaseName = 'transition'
-
 dependencies {
     compile project(':support-annotations')
     compile project(':support-v4')
diff --git a/tv-provider/build.gradle b/tv-provider/build.gradle
index 23146c9..d1ca739 100644
--- a/tv-provider/build.gradle
+++ b/tv-provider/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'support-tv-provider'
 
 dependencies {
     compile project(':support-annotations')
diff --git a/v13/build.gradle b/v13/build.gradle
index 9c25738..44eb9bd 100644
--- a/v13/build.gradle
+++ b/v13/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'support-v13'
 
 dependencies {
     compile project(':support-annotations')
diff --git a/v14/preference/build.gradle b/v14/preference/build.gradle
index e36ab82..f688de9 100644
--- a/v14/preference/build.gradle
+++ b/v14/preference/build.gradle
@@ -15,7 +15,6 @@
  */
 
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'preference-v14'
 
 dependencies {
     compile project(':support-v4')
diff --git a/v17/leanback/build.gradle b/v17/leanback/build.gradle
index 8c02cc4..e5890555 100644
--- a/v17/leanback/build.gradle
+++ b/v17/leanback/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'leanback-v17'
 
 dependencies {
     compile project(':support-compat')
diff --git a/v17/preference-leanback/build.gradle b/v17/preference-leanback/build.gradle
index 8de4c00..a849a8d 100644
--- a/v17/preference-leanback/build.gradle
+++ b/v17/preference-leanback/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'preference-leanback-v17'
 
 dependencies {
     compile project(':support-v4')
diff --git a/v4/build.gradle b/v4/build.gradle
index 87bc171..8060ad9 100644
--- a/v4/build.gradle
+++ b/v4/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'support-v4'
 
 dependencies {
     compile project(':support-compat')
diff --git a/v7/appcompat/build.gradle b/v7/appcompat/build.gradle
index f604aa3..b35eb7f 100644
--- a/v7/appcompat/build.gradle
+++ b/v7/appcompat/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'appcompat-v7'
 
 dependencies {
     compile project(':support-annotations')
diff --git a/v7/cardview/build.gradle b/v7/cardview/build.gradle
index b5a08ef..ff6adad 100644
--- a/v7/cardview/build.gradle
+++ b/v7/cardview/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'cardview-v7'
 
 dependencies {
     compile project(':support-annotations')
diff --git a/v7/gridlayout/build.gradle b/v7/gridlayout/build.gradle
index 63d149f..d71deea 100644
--- a/v7/gridlayout/build.gradle
+++ b/v7/gridlayout/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'gridlayout-v7'
 
 dependencies {
     compile project(':support-compat')
diff --git a/v7/mediarouter/build.gradle b/v7/mediarouter/build.gradle
index f971a0b..37f713f 100644
--- a/v7/mediarouter/build.gradle
+++ b/v7/mediarouter/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'mediarouter-v7'
 
 dependencies {
     compile project(":support-appcompat-v7")
diff --git a/v7/palette/build.gradle b/v7/palette/build.gradle
index 6ab7995..196bedb 100644
--- a/v7/palette/build.gradle
+++ b/v7/palette/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'palette-v7'
 
 dependencies {
     compile project(':support-compat')
diff --git a/v7/preference/build.gradle b/v7/preference/build.gradle
index a7ad709..e724575 100644
--- a/v7/preference/build.gradle
+++ b/v7/preference/build.gradle
@@ -15,7 +15,6 @@
  */
 
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'preference-v7'
 
 dependencies {
     compile project(':support-v4')
diff --git a/v7/recyclerview/build.gradle b/v7/recyclerview/build.gradle
index 2c8bef3..abdb7aa 100644
--- a/v7/recyclerview/build.gradle
+++ b/v7/recyclerview/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'recyclerview-v7'
 
 dependencies {
     compile project(':support-annotations')
diff --git a/wear/build.gradle b/wear/build.gradle
index d81f84e..efdf0b6 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: android.support.SupportLibraryPlugin
-archivesBaseName = 'wear'
 
 dependencies {
     compile project(':support-annotations')