diff --git a/auth/build.gradle b/auth/build.gradle
index 90d83581d..b2df3070c 100644
--- a/auth/build.gradle
+++ b/auth/build.gradle
@@ -51,8 +51,8 @@ dependencies {
     compile "com.android.support:cardview-v7:$support_library_version"
 
     testCompile 'junit:junit:4.12'
-    //noinspection GradleDynamicVersion
-    testCompile 'org.mockito:mockito-core:2.3.+'
+    //noinspection NewerVersionAvailable, GradleDynamicVersion
+    testCompile 'org.mockito:mockito-core:2.5.+'
     testCompile 'org.robolectric:robolectric:3.1.4'
     // See https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474
     testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java
index 593de0692..fb4001bc9 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java
@@ -113,8 +113,9 @@ public void onClick(View view) {
     }
 
     private String getIdpPromptString(String email) {
-        String promptStringTemplate = getResources().getString(R.string.welcome_back_idp_prompt);
-        return String.format(promptStringTemplate, email, mIdpProvider.getName(this));
+        return  getResources().getString(R.string.welcome_back_idp_prompt,
+                                         email,
+                                         mIdpProvider.getName(this));
     }
 
     @Override
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java
index 4e4d0ecc2..b1366c68f 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java
@@ -79,8 +79,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mPasswordField = (EditText) findViewById(R.id.password);
 
         // Create welcome back text with email bolded
-        String bodyText = getResources().getString(R.string.welcome_back_password_prompt_body);
-        bodyText = String.format(bodyText, mEmail);
+        String bodyText = getResources().getString(R.string.welcome_back_password_prompt_body, mEmail);
         SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(bodyText);
         int emailStart = bodyText.indexOf(mEmail);
         spannableStringBuilder.setSpan(new StyleSpan(Typeface.BOLD),
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoveryEmailSentDialog.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoveryEmailSentDialog.java
index 7b24c974c..147d5664b 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoveryEmailSentDialog.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoveryEmailSentDialog.java
@@ -21,8 +21,8 @@ public class RecoveryEmailSentDialog extends BaseDialog {
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         return new AlertDialog.Builder(getContext(), R.style.FirebaseUI_Dialog)
                 .setTitle(R.string.title_confirm_recover_password_activity)
-                .setMessage(String.format(getString(R.string.confirm_recovery_body),
-                                          getArguments().getString(ExtraConstants.EXTRA_EMAIL)))
+                .setMessage(getString(R.string.confirm_recovery_body,
+                                      getArguments().getString(ExtraConstants.EXTRA_EMAIL)))
                 .setOnDismissListener(new DialogInterface.OnDismissListener() {
                     @Override
                     public void onDismiss(DialogInterface anInterface) {
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/fieldvalidators/PasswordFieldValidator.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/fieldvalidators/PasswordFieldValidator.java
index bb91af8ea..dd117926e 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/fieldvalidators/PasswordFieldValidator.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/fieldvalidators/PasswordFieldValidator.java
@@ -24,9 +24,8 @@ public class PasswordFieldValidator extends BaseValidator {
     public PasswordFieldValidator(TextInputLayout errorContainer, int minLength) {
         super(errorContainer);
         mMinLength = minLength;
-        String template = mErrorContainer.getResources()
-                .getQuantityString(R.plurals.password_length, minLength);
-        mErrorMessage = String.format(template, mMinLength);
+        mErrorMessage = mErrorContainer.getResources()
+                .getQuantityString(R.plurals.password_length, minLength, mMinLength);
     }
 
     @Override
diff --git a/build.gradle b/build.gradle
index 4c5ce7753..cad93ae4c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0-alpha2'
+        classpath 'com.android.tools.build:gradle:2.3.0-beta1'
         classpath 'com.google.gms:google-services:3.0.0'
         classpath 'io.fabric.tools:gradle:1.+'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
diff --git a/library/quality/quality.gradle b/library/quality/quality.gradle
index 0d6b43b5b..0459d609b 100644
--- a/library/quality/quality.gradle
+++ b/library/quality/quality.gradle
@@ -69,7 +69,7 @@ task pmd(type: Pmd) {
 
 android {
     lintOptions {
-        disable 'InvalidPackage'
+        disable 'InvalidPackage', 'RestrictedApi'
         baseline file("$configDir/lint-baseline.xml")
         checkAllWarnings true
         warningsAsErrors true