diff --git a/sdk/android/api/org/webrtc/CryptoOptions.java b/sdk/android/api/org/webrtc/CryptoOptions.java
index 1ccc6df71d..77b9552aad 100644
--- a/sdk/android/api/org/webrtc/CryptoOptions.java
+++ b/sdk/android/api/org/webrtc/CryptoOptions.java
@@ -7,6 +7,7 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
+
 package org.webrtc;
 
 /**
@@ -108,10 +109,10 @@ public final class CryptoOptions {
   }
 
   public static class Builder {
-    private boolean enableGcmCryptoSuites = false;
-    private boolean enableAes128Sha1_32CryptoCipher = false;
-    private boolean enableEncryptedRtpHeaderExtensions = false;
-    private boolean requireFrameEncryption = false;
+    private boolean enableGcmCryptoSuites;
+    private boolean enableAes128Sha1_32CryptoCipher;
+    private boolean enableEncryptedRtpHeaderExtensions;
+    private boolean requireFrameEncryption;
 
     private Builder() {}
 
diff --git a/sdk/android/api/org/webrtc/NetworkMonitor.java b/sdk/android/api/org/webrtc/NetworkMonitor.java
index ba6bae0ed8..9764a0cb35 100644
--- a/sdk/android/api/org/webrtc/NetworkMonitor.java
+++ b/sdk/android/api/org/webrtc/NetworkMonitor.java
@@ -14,11 +14,10 @@ import static org.webrtc.NetworkMonitorAutoDetect.INVALID_NET_ID;
 
 import android.content.Context;
 import android.os.Build;
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
-import org.webrtc.NetworkMonitorAutoDetect.ConnectionType;
-import org.webrtc.NetworkMonitorAutoDetect.NetworkInformation;
+import javax.annotation.Nullable;
+import org.webrtc.NetworkMonitorAutoDetect;
 
 /**
  * Borrowed from Chromium's
@@ -33,7 +32,7 @@ public class NetworkMonitor {
    * Alerted when the connection type of the network changes. The alert is fired on the UI thread.
    */
   public interface NetworkObserver {
-    public void onConnectionTypeChanged(ConnectionType connectionType);
+    public void onConnectionTypeChanged(NetworkMonitorAutoDetect.ConnectionType connectionType);
   }
 
   private static final String TAG = "NetworkMonitor";
@@ -55,13 +54,13 @@ public class NetworkMonitor {
   // Also guarded by autoDetectLock.
   private int numObservers;
 
-  private volatile ConnectionType currentConnectionType;
+  private volatile NetworkMonitorAutoDetect.ConnectionType currentConnectionType;
 
   private NetworkMonitor() {
     nativeNetworkObservers = new ArrayList<Long>();
     networkObservers = new ArrayList<NetworkObserver>();
     numObservers = 0;
-    currentConnectionType = ConnectionType.CONNECTION_UNKNOWN;
+    currentConnectionType = NetworkMonitorAutoDetect.ConnectionType.CONNECTION_UNKNOWN;
   }
 
   // TODO(sakal): Remove once downstream dependencies have been updated.
@@ -155,7 +154,7 @@ public class NetworkMonitor {
     return Build.VERSION.SDK_INT;
   }
 
-  private ConnectionType getCurrentConnectionType() {
+  private NetworkMonitorAutoDetect.ConnectionType getCurrentConnectionType() {
     return currentConnectionType;
   }
 
@@ -169,12 +168,13 @@ public class NetworkMonitor {
     return new NetworkMonitorAutoDetect(new NetworkMonitorAutoDetect.Observer() {
 
       @Override
-      public void onConnectionTypeChanged(ConnectionType newConnectionType) {
+      public void onConnectionTypeChanged(
+          NetworkMonitorAutoDetect.ConnectionType newConnectionType) {
         updateCurrentConnectionType(newConnectionType);
       }
 
       @Override
-      public void onNetworkConnect(NetworkInformation networkInfo) {
+      public void onNetworkConnect(NetworkMonitorAutoDetect.NetworkInformation networkInfo) {
         notifyObserversOfNetworkConnect(networkInfo);
       }
 
@@ -185,13 +185,15 @@ public class NetworkMonitor {
     }, appContext);
   }
 
-  private void updateCurrentConnectionType(ConnectionType newConnectionType) {
+  private void updateCurrentConnectionType(
+      NetworkMonitorAutoDetect.ConnectionType newConnectionType) {
     currentConnectionType = newConnectionType;
     notifyObserversOfConnectionTypeChange(newConnectionType);
   }
 
   /** Alerts all observers of a connection change. */
-  private void notifyObserversOfConnectionTypeChange(ConnectionType newConnectionType) {
+  private void notifyObserversOfConnectionTypeChange(
+      NetworkMonitorAutoDetect.ConnectionType newConnectionType) {
     List<Long> nativeObservers = getNativeNetworkObserversSync();
     for (Long nativeObserver : nativeObservers) {
       nativeNotifyConnectionTypeChanged(nativeObserver);
@@ -206,7 +208,8 @@ public class NetworkMonitor {
     }
   }
 
-  private void notifyObserversOfNetworkConnect(NetworkInformation networkInfo) {
+  private void notifyObserversOfNetworkConnect(
+      NetworkMonitorAutoDetect.NetworkInformation networkInfo) {
     List<Long> nativeObservers = getNativeNetworkObserversSync();
     for (Long nativeObserver : nativeObservers) {
       nativeNotifyOfNetworkConnect(nativeObserver, networkInfo);
@@ -221,7 +224,7 @@ public class NetworkMonitor {
   }
 
   private void updateObserverActiveNetworkList(long nativeObserver) {
-    List<NetworkInformation> networkInfoList;
+    List<NetworkMonitorAutoDetect.NetworkInformation> networkInfoList;
     synchronized (autoDetectLock) {
       networkInfoList = (autoDetect == null) ? null : autoDetect.getActiveNetworkList();
     }
@@ -229,7 +232,8 @@ public class NetworkMonitor {
       return;
     }
 
-    NetworkInformation[] networkInfos = new NetworkInformation[networkInfoList.size()];
+    NetworkMonitorAutoDetect.NetworkInformation[] networkInfos =
+        new NetworkMonitorAutoDetect.NetworkInformation[networkInfoList.size()];
     networkInfos = networkInfoList.toArray(networkInfos);
     nativeNotifyOfActiveNetworkList(nativeObserver, networkInfos);
   }
@@ -274,17 +278,18 @@ public class NetworkMonitor {
 
   /** Checks if there currently is connectivity. */
   public static boolean isOnline() {
-    ConnectionType connectionType = getInstance().getCurrentConnectionType();
-    return connectionType != ConnectionType.CONNECTION_NONE;
+    NetworkMonitorAutoDetect.ConnectionType connectionType =
+        getInstance().getCurrentConnectionType();
+    return connectionType != NetworkMonitorAutoDetect.ConnectionType.CONNECTION_NONE;
   }
 
   private native void nativeNotifyConnectionTypeChanged(long nativeAndroidNetworkMonitor);
   private native void nativeNotifyOfNetworkConnect(
-      long nativeAndroidNetworkMonitor, NetworkInformation networkInfo);
+      long nativeAndroidNetworkMonitor, NetworkMonitorAutoDetect.NetworkInformation networkInfo);
   private native void nativeNotifyOfNetworkDisconnect(
       long nativeAndroidNetworkMonitor, long networkHandle);
   private native void nativeNotifyOfActiveNetworkList(
-      long nativeAndroidNetworkMonitor, NetworkInformation[] networkInfos);
+      long nativeAndroidNetworkMonitor, NetworkMonitorAutoDetect.NetworkInformation[] networkInfos);
 
   // For testing only.
   @Nullable
diff --git a/sdk/android/api/org/webrtc/PeerConnection.java b/sdk/android/api/org/webrtc/PeerConnection.java
index 23c9ae864a..47c54ee549 100644
--- a/sdk/android/api/org/webrtc/PeerConnection.java
+++ b/sdk/android/api/org/webrtc/PeerConnection.java
@@ -14,6 +14,9 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import javax.annotation.Nullable;
+import org.webrtc.DataChannel;
+import org.webrtc.MediaStreamTrack;
+import org.webrtc.RtpTransceiver;
 
 /**
  * Java-land version of the PeerConnection APIs; wraps the C++ API
diff --git a/sdk/android/api/org/webrtc/PeerConnectionFactory.java b/sdk/android/api/org/webrtc/PeerConnectionFactory.java
index 4cf2f893ae..41a00567c9 100644
--- a/sdk/android/api/org/webrtc/PeerConnectionFactory.java
+++ b/sdk/android/api/org/webrtc/PeerConnectionFactory.java
@@ -14,6 +14,7 @@ import android.content.Context;
 import java.util.List;
 import javax.annotation.Nullable;
 import org.webrtc.Logging.Severity;
+import org.webrtc.PeerConnection;
 import org.webrtc.audio.AudioDeviceModule;
 import org.webrtc.audio.LegacyAudioDeviceModule;
 
diff --git a/sdk/android/api/org/webrtc/RtcCertificatePem.java b/sdk/android/api/org/webrtc/RtcCertificatePem.java
index 6856e4099d..6070135b3e 100644
--- a/sdk/android/api/org/webrtc/RtcCertificatePem.java
+++ b/sdk/android/api/org/webrtc/RtcCertificatePem.java
@@ -10,6 +10,8 @@
 
 package org.webrtc;
 
+import org.webrtc.PeerConnection;
+
 /**
  * Easily storable/serializable version of a native C++ RTCCertificatePEM.
  */
diff --git a/sdk/android/api/org/webrtc/RtpTransceiver.java b/sdk/android/api/org/webrtc/RtpTransceiver.java
index a4a5aa0540..7f875e6c8e 100644
--- a/sdk/android/api/org/webrtc/RtpTransceiver.java
+++ b/sdk/android/api/org/webrtc/RtpTransceiver.java
@@ -13,6 +13,7 @@ package org.webrtc;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import org.webrtc.MediaStreamTrack;
 
 /**
  * Java wrapper for a C++ RtpTransceiverInterface.
diff --git a/sdk/android/instrumentationtests/src/org/webrtc/RtcCertificatePemTest.java b/sdk/android/instrumentationtests/src/org/webrtc/RtcCertificatePemTest.java
index e1840c356d..00f295c942 100644
--- a/sdk/android/instrumentationtests/src/org/webrtc/RtcCertificatePemTest.java
+++ b/sdk/android/instrumentationtests/src/org/webrtc/RtcCertificatePemTest.java
@@ -12,13 +12,13 @@ package org.webrtc;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import org.chromium.base.test.BaseJUnit4ClassRunner;
 import android.support.test.filters.SmallTest;
-import org.junit.runner.RunWith;
+import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.webrtc.PeerConnection;
 import org.webrtc.RtcCertificatePem;
-import org.webrtc.PeerConnection.KeyType;
 
 /** Tests for RtcCertificatePem.java. */
 @RunWith(BaseJUnit4ClassRunner.class)
diff --git a/sdk/android/src/java/org/webrtc/NativeCapturerObserver.java b/sdk/android/src/java/org/webrtc/NativeCapturerObserver.java
index 24869818a6..f673b24885 100644
--- a/sdk/android/src/java/org/webrtc/NativeCapturerObserver.java
+++ b/sdk/android/src/java/org/webrtc/NativeCapturerObserver.java
@@ -11,6 +11,7 @@
 package org.webrtc;
 
 import javax.annotation.Nullable;
+import org.webrtc.VideoFrame;
 
 /**
  * Implements VideoCapturer.CapturerObserver and feeds frames to