diff --git a/app/build.gradle b/app/build.gradle
index c6c221071..69016eb71 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -43,7 +43,6 @@ dependencies {
     // The following dependencies are not required to use the Firebase UI library.
     // They are used to make some aspects of the demo app implementation simpler for
     // demonstrative purposes, and you may find them useful in your own apps; YMMV.
-    compile 'com.github.bumptech.glide:glide:3.7.0'
     compile 'pub.devrel:easypermissions:0.2.1'
     compile 'com.jakewharton:butterknife:8.4.0'
     apt 'com.jakewharton:butterknife-compiler:8.4.0'
diff --git a/auth/build.gradle b/auth/build.gradle
index def5b069b..268fd7948 100644
--- a/auth/build.gradle
+++ b/auth/build.gradle
@@ -27,13 +27,6 @@ android {
             }
         }
     }
-
-    lintOptions {
-        // We have okio as a transitive dependency, which causes some lint errors due to
-        // using Java 8 nio packages. Safely downgrading them to warning.
-        // https://github.com/square/okio/issues/58
-        warning 'InvalidPackage'
-    }
 }
 
 dependencies {
diff --git a/build.gradle b/build.gradle
index cad93ae4c..808f7fc5c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,11 +8,11 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0-beta1'
+        classpath 'com.android.tools.build:gradle:2.3.0-beta2'
         classpath 'com.google.gms:google-services:3.0.0'
         classpath 'io.fabric.tools:gradle:1.+'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.2'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
     }
 }
 
diff --git a/library/quality/quality.gradle b/library/quality/quality.gradle
index 0459d609b..c2ce187dc 100644
--- a/library/quality/quality.gradle
+++ b/library/quality/quality.gradle
@@ -69,7 +69,11 @@ task pmd(type: Pmd) {
 
 android {
     lintOptions {
-        disable 'InvalidPackage', 'RestrictedApi'
+        // We have okio as a transitive dependency, which causes some lint errors due to
+        // using Java 8 nio packages. Safely downgrading them to warning.
+        // https://github.com/square/okio/issues/58
+        disable 'InvalidPackage'
+
         baseline file("$configDir/lint-baseline.xml")
         checkAllWarnings true
         warningsAsErrors true