diff --git a/LabApiUtilities/build.gradle b/LabApiUtilities/build.gradle
index b991327e96..790d6b0601 100644
--- a/LabApiUtilities/build.gradle
+++ b/LabApiUtilities/build.gradle
@@ -114,7 +114,7 @@ publishing {
     repositories {
         maven {
             name "vsts-maven-adal-android"
-            url "https://identitydivision.pkgs.visualstudio.com/_packaging/AndroidADAL/maven/v1"
+            url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1"
             credentials {
                 username project.ext.vstsUsername
                 password project.ext.vstsMavenAccessToken
diff --git a/common/build.gradle b/common/build.gradle
index 8ef607f715..5da8792b1f 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -420,7 +420,7 @@ afterEvaluate {
         repositories {
             maven {
                 name "vsts-maven-adal-android"
-                url "https://identitydivision.pkgs.visualstudio.com/_packaging/AndroidADAL/maven/v1"
+                url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1"
                 credentials {
                     username project.vstsUsername
                     password project.vstsMavenAccessToken
diff --git a/common4j/build.gradle b/common4j/build.gradle
index 60dc352ecf..716ae1c664 100644
--- a/common4j/build.gradle
+++ b/common4j/build.gradle
@@ -197,7 +197,7 @@ publishing {
     repositories {
         maven {
             name "vsts-maven-adal-android"
-            url "https://identitydivision.pkgs.visualstudio.com/_packaging/AndroidADAL/maven/v1"
+            url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1"
             credentials {
                 username project.ext.vstsUsername
                 password project.ext.vstsMavenAccessToken
@@ -339,8 +339,11 @@ buildConfig {
 }
 
 afterEvaluate {
-    assemble.dependsOn sourcesJar, javadocJar
-
+    // sourcesJar and javadocJar are wired into the publish graph via components.java + maven-publish,
+    // so they will run automatically as part of `publish`. There is no need to also tie them to
+    // `assemble`, which made every CI build (including test-only / spotbugs-only flows) generate
+    // javadoc unnecessarily. Generating javadoc for common4j is one of the slower tasks in the build.
+    // Local devs who explicitly want the artifacts can still run `./gradlew sourcesJar javadocJar`.
     // these tasks are generated by the buildconfig plugin..for more details, read comment about it
     // above in the plugins block.
     compileJava.dependsOn generateBuildConfig, generateTestBuildConfig
diff --git a/gradle.properties b/gradle.properties
index ae84629666..f652101c39 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,6 +6,7 @@ android.useAndroidX=true
 # https://office.visualstudio.com/Outlook%20Mobile/_wiki/wikis/Outlook-Mobile.wiki/3780/Android-Studio-Gradle-Performance-tips-and-tricks
 org.gradle.parallel=true
 org.gradle.daemon=true
+org.gradle.configureondemand=true
 
 # See https://stackoverflow.com/questions/56075455/expiring-daemon-because-jvm-heap-space-is-exhausted
 # we must make sure that the total size is <7G, as that's the RAM size of VM on the build pipeline.
diff --git a/keyvault/build.gradle b/keyvault/build.gradle
index ace7611de8..32ff9cab88 100644
--- a/keyvault/build.gradle
+++ b/keyvault/build.gradle
@@ -29,7 +29,7 @@ publishing {
     repositories {
         maven {
             name "vsts-maven-adal-android"
-            url "https://identitydivision.pkgs.visualstudio.com/_packaging/AndroidADAL/maven/v1"
+            url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1"
             credentials {
                 username project.ext.vstsUsername
                 password project.ext.vstsMavenAccessToken
diff --git a/labapi/build.gradle b/labapi/build.gradle
index c7be9b067b..58d2d923cc 100644
--- a/labapi/build.gradle
+++ b/labapi/build.gradle
@@ -30,7 +30,7 @@ publishing {
     repositories {
         maven {
             name "vsts-maven-adal-android"
-            url "https://identitydivision.pkgs.visualstudio.com/_packaging/AndroidADAL/maven/v1"
+            url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1"
             credentials {
                 username project.ext.vstsUsername
                 password project.ext.vstsMavenAccessToken
diff --git a/testutils/build.gradle b/testutils/build.gradle
index f03c50da2e..ba77838c57 100644
--- a/testutils/build.gradle
+++ b/testutils/build.gradle
@@ -129,7 +129,7 @@ project.afterEvaluate{
         repositories {
             maven {
                 name "vsts-maven-adal-android"
-                url "https://identitydivision.pkgs.visualstudio.com/_packaging/AndroidADAL/maven/v1"
+                url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1"
                 credentials {
                     username project.ext.vstsUsername
                     password project.ext.vstsMavenAccessToken
diff --git a/uiautomationutilities/build.gradle b/uiautomationutilities/build.gradle
index 0dabacbe89..897c14dedd 100644
--- a/uiautomationutilities/build.gradle
+++ b/uiautomationutilities/build.gradle
@@ -175,7 +175,7 @@ project.afterEvaluate{
         repositories {
             maven {
                 name "vsts-maven-adal-android"
-                url "https://identitydivision.pkgs.visualstudio.com/_packaging/AndroidADAL/maven/v1"
+                url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1"
                 credentials {
                     username project.ext.vstsUsername
                     password project.ext.vstsMavenAccessToken