diff --git a/extensions/okhttp/build.gradle b/extensions/okhttp/build.gradle
index 2f7d84d33b..2b653c3f0e 100644
--- a/extensions/okhttp/build.gradle
+++ b/extensions/okhttp/build.gradle
@@ -23,19 +23,12 @@ android {
         targetSdkVersion project.ext.targetSdkVersion
         consumerProguardFiles 'proguard-rules.txt'
     }
-
-    lintOptions {
-        // See: https://github.com/square/okio/issues/58
-        warning 'InvalidPackage'
-    }
 }
 
 dependencies {
     implementation project(modulePrefix + 'library-core')
     implementation 'com.android.support:support-annotations:' + supportLibraryVersion
-    api('com.squareup.okhttp3:okhttp:3.10.0') {
-        exclude group: 'org.json'
-    }
+    api 'com.squareup.okhttp3:okhttp:3.10.0'
 }
 
 ext {
diff --git a/testutils_robolectric/build.gradle b/testutils_robolectric/build.gradle
index c221149c29..1fd745c676 100644
--- a/testutils_robolectric/build.gradle
+++ b/testutils_robolectric/build.gradle
@@ -24,9 +24,8 @@ android {
     }
 
     lintOptions {
-        // Truth depends on JUnit, which depends on java.lang.management, which
-        // is not part of Android. Remove this when JUnit 4.13 or later is used.
-        // See: https://github.com/junit-team/junit4/pull/1187.
+        // Robolectric depends on BouncyCastle, which depends on javax.naming,
+        // which is not part of Android.
         disable 'InvalidPackage'
     }
 }