diff --git a/common b/common
index 8d611f456..04af5dbdb 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 8d611f4561ac377d07fcafabff8ded8c94596727
+Subproject commit 04af5dbdb18833415629d17b95be43420dffb32e
diff --git a/msal/build.gradle b/msal/build.gradle
index 24ce6cd36..3bc9a4c75 100644
--- a/msal/build.gradle
+++ b/msal/build.gradle
@@ -138,6 +138,14 @@ android {
         }
     }
 
+    libraryVariants.all { variant ->
+        tasks.named("assemble${variant.name.capitalize()}").configure {
+            doFirst {
+                println("Assembling variant: ${variant.name} for ${project.name}")
+            }
+        }
+    }
+
     testOptions {
         unitTests.all {
             if (!project.hasProperty('labtest')) {
diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/joined/TestCase1561151.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/joined/TestCase1561151.java
index dc65b197f..2422ac339 100644
--- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/joined/TestCase1561151.java
+++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/joined/TestCase1561151.java
@@ -41,6 +41,7 @@
 import com.microsoft.identity.labapi.utilities.constants.TempUserType;
 
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.Arrays;
@@ -51,6 +52,7 @@
 @RetryOnFailure
 @LongUIAutomationTest("Password reset test")
 @RunOnAPI29Minus
+@Ignore("Ignore until lab issue is resolved for Reset API")
 public class TestCase1561151 extends AbstractMsalBrokerTest {
     @Test
     public void test_1561151_Joined_PasswordChange() throws Throwable {
diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mam/TestCase850457.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mam/TestCase850457.java
index b30e35c4e..3c219d9cd 100644
--- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mam/TestCase850457.java
+++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/mam/TestCase850457.java
@@ -40,6 +40,7 @@
 import com.microsoft.identity.labapi.utilities.constants.TempUserType;
 
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.Arrays;
@@ -50,6 +51,7 @@
 @RetryOnFailure
 @LongUIAutomationTest("Password reset test")
 @RunOnAPI29Minus
+@Ignore("Ignore until lab issue is resolved for Reset API")
 public class TestCase850457 extends AbstractMsalBrokerTest {
 
     @Test
diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase1561152.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase1561152.java
index a07ff1e5d..bd2b2379e 100644
--- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase1561152.java
+++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase1561152.java
@@ -43,6 +43,7 @@
 import com.microsoft.identity.labapi.utilities.constants.TempUserType;
 
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
@@ -52,6 +53,7 @@
 @RetryOnFailure
 @LongUIAutomationTest("Password reset test")
 @RunOnAPI29Minus
+@Ignore("Ignore until lab issue is resolved for Reset API")
 public class TestCase1561152 extends AbstractMsalBrokerTest {
 
     @Test
diff --git a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase2139526.java b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase2139526.java
index 79097197e..d18ab11f0 100644
--- a/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase2139526.java
+++ b/msalautomationapp/src/androidTest/java/com/microsoft/identity/client/msal/automationapp/testpass/broker/nonjoined/TestCase2139526.java
@@ -40,6 +40,7 @@
 import com.microsoft.identity.labapi.utilities.constants.ProtectionPolicy;
 import com.microsoft.identity.labapi.utilities.constants.TempUserType;
 
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.Arrays;
@@ -49,6 +50,7 @@
 // https://identitydivision.visualstudio.com/Engineering/_workitems/edit/2139526
 @RetryOnFailure
 @LongUIAutomationTest
+@Ignore("Ignore until lab issue is resolved for Enable Policy API")
 public class TestCase2139526 extends AbstractMsalBrokerTest {
 
     @Test