diff --git a/android-interop-testing/src/main/AndroidManifest.xml b/android-interop-testing/src/main/AndroidManifest.xml
index 35f3ee33a2b..da7ccef5b1d 100644
--- a/android-interop-testing/src/main/AndroidManifest.xml
+++ b/android-interop-testing/src/main/AndroidManifest.xml
@@ -5,7 +5,9 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <!-- For UDS -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28" />
     <uses-sdk tools:overrideLibrary="io.grpc.android"/>
 
     <application
@@ -16,8 +18,7 @@
         android:name="androidx.multidex.MultiDexApplication">
         <activity
             android:name=".TesterActivity"
-            android:exported="true"
-            android:label="@string/app_name" >
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/android-interop-testing/src/main/java/io/grpc/android/integrationtest/TesterActivity.java b/android-interop-testing/src/main/java/io/grpc/android/integrationtest/TesterActivity.java
index fb5b35c42d5..17c7e24cbfa 100644
--- a/android-interop-testing/src/main/java/io/grpc/android/integrationtest/TesterActivity.java
+++ b/android-interop-testing/src/main/java/io/grpc/android/integrationtest/TesterActivity.java
@@ -121,7 +121,7 @@ private void startTest(String testCase) {
     ((InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE)).hideSoftInputFromWindow(
         hostEdit.getWindowToken(), 0);
     enableButtons(false);
-    resultText.setText("Testing...");
+    resultText.setText(R.string.testing_message);
 
     String host = hostEdit.getText().toString();
     String portStr = portEdit.getText().toString();
diff --git a/android-interop-testing/src/main/res/layout/activity_tester.xml b/android-interop-testing/src/main/res/layout/activity_tester.xml
index e25bd1bb6f6..042da6437c0 100644
--- a/android-interop-testing/src/main/res/layout/activity_tester.xml
+++ b/android-interop-testing/src/main/res/layout/activity_tester.xml
@@ -16,6 +16,7 @@
         android:layout_weight="2"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:inputType="text"
         android:hint="Enter Host"
         />
     <EditText
diff --git a/android-interop-testing/src/main/res/values/strings.xml b/android-interop-testing/src/main/res/values/strings.xml
index 6d5cb2a79ce..33b28eb9456 100644
--- a/android-interop-testing/src/main/res/values/strings.xml
+++ b/android-interop-testing/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
 <resources>
     <string name="app_name">gRPC Integration Test</string>
+    <string name="testing_message">Testing…</string>
 </resources>
diff --git a/binder/src/main/AndroidManifest.xml b/binder/src/main/AndroidManifest.xml
index a30cbbdd6fa..239c3b39b38 100644
--- a/binder/src/main/AndroidManifest.xml
+++ b/binder/src/main/AndroidManifest.xml
@@ -1,2 +1,11 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" >
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <queries>
+
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+        </intent>
+
+    </queries>
+
+</manifest>
\ No newline at end of file
diff --git a/lint.xml b/lint.xml
index 93e2f603108..5b35a8d151b 100644
--- a/lint.xml
+++ b/lint.xml
@@ -5,4 +5,9 @@
       Remove after AGP upgrade.
     -->
     <issue id="OldTargetApi" severity="ignore" />
+
+    <!--
+    Suppress temporarily 'VisibleForTests' warnings - exposed for testing purposes
+    -->
+    <issue id="VisibleForTests" severity="ignore" />
 </lint>