diff --git a/tools-webrtc/android/suppressions.xml b/tools-webrtc/android/suppressions.xml
index 52b0ad8371..9055c76dc2 100644
--- a/tools-webrtc/android/suppressions.xml
+++ b/tools-webrtc/android/suppressions.xml
@@ -11,6 +11,8 @@
   <issue id="LongLogTag" severity="ignore"/>
   <issue id="Registered" severity="ignore"/>
   <issue id="MissingPermission" severity="ignore"/>
+  <issue id="ApplySharedPref" severity="ignore"/>
+  <!-- TODO(sakal): Remove once the lint tool is updated. -->
   <issue id="CommitPrefEdits" severity="ignore"/>
   <issue id="UnusedResources" severity="ignore"/>
   <issue id="IconColors" severity="ignore"/>
diff --git a/webrtc/examples/androidapp/res/layout/activity_connect.xml b/webrtc/examples/androidapp/res/layout/activity_connect.xml
index 2a80774b72..83707f72ed 100644
--- a/webrtc/examples/androidapp/res/layout/activity_connect.xml
+++ b/webrtc/examples/androidapp/res/layout/activity_connect.xml
@@ -26,7 +26,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:singleLine="true"
+            android:maxLines="1"
             android:imeOptions="actionDone"
             android:inputType="text"/>
 
@@ -74,4 +74,4 @@
             android:gravity="center"
             android:text="@string/no_favorites" />
     </FrameLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCBluetoothManager.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCBluetoothManager.java
index ee58cea73a..9553c8a0f5 100644
--- a/webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCBluetoothManager.java
+++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCBluetoothManager.java
@@ -10,8 +10,7 @@
 
 package org.appspot.apprtc;
 
-import org.appspot.apprtc.util.AppRTCUtils;
-
+import android.annotation.SuppressLint;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothHeadset;
@@ -26,11 +25,10 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Process;
 import android.util.Log;
-
-import org.webrtc.ThreadUtils;
-
 import java.util.List;
 import java.util.Set;
+import org.appspot.apprtc.util.AppRTCUtils;
+import org.webrtc.ThreadUtils;
 
 /**
  * AppRTCProximitySensor manages functions related to Bluetoth devices in the
@@ -409,6 +407,7 @@ public class AppRTCBluetoothManager {
   }
 
   /** Logs the state of the local Bluetooth adapter. */
+  @SuppressLint("HardwareIds")
   protected void logBluetoothAdapterInfo(BluetoothAdapter localAdapter) {
     Log.d(TAG, "BluetoothAdapter: "
             + "enabled=" + localAdapter.isEnabled() + ", "
diff --git a/webrtc/sdk/android/api/org/webrtc/NetworkMonitor.java b/webrtc/sdk/android/api/org/webrtc/NetworkMonitor.java
index 985e34671b..8b04676d1d 100644
--- a/webrtc/sdk/android/api/org/webrtc/NetworkMonitor.java
+++ b/webrtc/sdk/android/api/org/webrtc/NetworkMonitor.java
@@ -14,9 +14,9 @@ import static org.webrtc.NetworkMonitorAutoDetect.ConnectionType;
 import static org.webrtc.NetworkMonitorAutoDetect.INVALID_NET_ID;
 import static org.webrtc.NetworkMonitorAutoDetect.NetworkInformation;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Build;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -37,7 +37,9 @@ public class NetworkMonitor {
   }
 
   private static final String TAG = "NetworkMonitor";
-  private static NetworkMonitor instance;
+
+  // We are storing application context so it is okay.
+  @SuppressLint("StaticFieldLeak") private static NetworkMonitor instance;
 
   private final Context applicationContext;
 
@@ -53,8 +55,7 @@ public class NetworkMonitor {
 
   private NetworkMonitor(Context context) {
     assertIsTrue(context != null);
-    applicationContext =
-        context.getApplicationContext() == null ? context : context.getApplicationContext();
+    applicationContext = context.getApplicationContext();
 
     nativeNetworkObservers = new ArrayList<Long>();
     networkObservers = new ArrayList<NetworkObserver>();