diff --git a/demo/build.gradle b/demo/build.gradle
index 007dc70590..01946c8504 100644
--- a/demo/build.gradle
+++ b/demo/build.gradle
@@ -33,6 +33,11 @@ android {
         }
     }
 
+    lintOptions {
+        // The demo app does not have translations.
+        disable 'MissingTranslation'
+    }
+
     productFlavors {
         noExtensions
         withExtensions
diff --git a/demo/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java b/demo/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
index d6655b79b9..081ad190b5 100644
--- a/demo/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
+++ b/demo/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
@@ -262,7 +262,7 @@ public class SampleChooserActivity extends Activity {
     }
 
     private UUID getDrmUuid(String typeString) throws ParserException {
-      switch (typeString.toLowerCase()) {
+      switch (Util.toLowerInvariant(typeString)) {
         case "widevine":
           return C.WIDEVINE_UUID;
         case "playready":
diff --git a/extensions/okhttp/build.gradle b/extensions/okhttp/build.gradle
index f4cdfdb853..8fc4d08ae3 100644
--- a/extensions/okhttp/build.gradle
+++ b/extensions/okhttp/build.gradle
@@ -22,6 +22,11 @@ android {
         minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
     }
+
+    lintOptions {
+        // See: https://github.com/square/okio/issues/58
+        warning 'InvalidPackage'
+    }
 }
 
 dependencies {