diff --git a/webrtc/build/android/suppressions.xml b/webrtc/build/android/suppressions.xml
index ead7c4d13e..d48ccb348f 100644
--- a/webrtc/build/android/suppressions.xml
+++ b/webrtc/build/android/suppressions.xml
@@ -14,7 +14,6 @@
-
@@ -24,7 +23,6 @@
-
diff --git a/webrtc/examples/androidapp/res/values/strings.xml b/webrtc/examples/androidapp/res/values/strings.xml
index e8bbbd540d..c6935a4622 100644
--- a/webrtc/examples/androidapp/res/values/strings.xml
+++ b/webrtc/examples/androidapp/res/values/strings.xml
@@ -162,12 +162,10 @@
enable_datachannel_preference
Enable datachannel.
- Enable datachannel.
true
ordered_preference
Order messages.
- Order messages.
true
Subprotocol
@@ -177,7 +175,6 @@
negotiated_preference
Negotiated.
- Negotiated.
false
max_retransmit_time_ms_preference
diff --git a/webrtc/sdk/android/instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java b/webrtc/sdk/android/instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java
index 5cf48e6789..eba555b476 100644
--- a/webrtc/sdk/android/instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java
+++ b/webrtc/sdk/android/instrumentationtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java
@@ -13,6 +13,7 @@ package org.webrtc;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
+import android.annotation.SuppressLint;
import android.graphics.Point;
import android.support.test.InstrumentationRegistry;
import android.support.test.annotation.UiThreadTest;
@@ -60,6 +61,7 @@ public class SurfaceViewRendererOnMeasureTest {
/**
* Assert onMeasure() with given parameters will result in expected measured size.
*/
+ @SuppressLint("WrongCall")
private static void assertMeasuredSize(SurfaceViewRenderer surfaceViewRenderer,
RendererCommon.ScalingType scalingType, String frameDimensions, int expectedWidth,
int expectedHeight, int widthSpec, int heightSpec) {