diff --git a/runner/rules/javatests/androidx/test/rule/BUILD b/runner/rules/javatests/androidx/test/rule/BUILD
index b69b9be7d..d985e20d0 100644
--- a/runner/rules/javatests/androidx/test/rule/BUILD
+++ b/runner/rules/javatests/androidx/test/rule/BUILD
@@ -57,7 +57,7 @@ axt_android_library_test(
     name = "GrantPermissionRuleTest",
     srcs = ["GrantPermissionRuleTest.java"],
     # runtime permissions only a thing from api 23+
-    device_list = devices(apis(min_api = 23)),
+    device_list = devices(apis(min_api = 24)),
     deps = [
         "//core",
         "//ext/junit",
diff --git a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest.xml b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest.xml
index 943286b49..3b9d8d388 100644
--- a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest.xml
+++ b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest.xml
@@ -23,7 +23,8 @@
 
   <instrumentation
     android:name="androidx.test.runner.AndroidJUnitRunner"
-    android:targetPackage="androidx.test.multiprocess.app">
+    android:targetPackage="androidx.test.multiprocess.app"
+    android:targetProcesses="*">
     <meta-data
       android:name="remoteMethod"
       android:value="androidx.test.espresso.remote.EspressoRemote#remoteInit"/>
diff --git a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_global.xml b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_global.xml
index 7b5d08c3f..d8ca4704b 100644
--- a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_global.xml
+++ b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_global.xml
@@ -24,16 +24,12 @@
 
   <instrumentation
     android:name="androidx.test.runner.AndroidJUnitRunner"
-    android:targetPackage="androidx.test.multiprocess.app">
+    android:targetPackage="androidx.test.multiprocess.app"
+    android:targetProcesses="foo.bar.global">
 
-    <!-- explicitly instrument global process: -->
     <meta-data
-      android:name="targetProcess"
-      android:value="foo.bar.global"/>
-
-    <!-- TODO: change to the syntax after next emulator image update -->
-    <!--android:targetProcess="foo.bar"-->
-
+      android:name="remoteMethod"
+      android:value="androidx.test.espresso.remote.EspressoRemote#remoteInit"/>
   </instrumentation>
 
 </manifest>
diff --git a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_idling.xml b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_idling.xml
index e2b484ee2..49871ee25 100644
--- a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_idling.xml
+++ b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_idling.xml
@@ -24,16 +24,12 @@
 
   <instrumentation
     android:name="androidx.test.runner.AndroidJUnitRunner"
-    android:targetPackage="androidx.test.multiprocess.app">
+    android:targetPackage="androidx.test.multiprocess.app"
+    android:targetProcesses="androidx.test.multiprocess.app:idling">
 
-    <!-- explicitly instrument idling process: -->
     <meta-data
-      android:name="targetProcess"
-      android:value="androidx.test.multiprocess.app:idling"/>
-
-    <!-- TODO: change to the syntax after next emulator image update -->
-    <!--android:targetProcess=":idling"-->
-
+      android:name="remoteMethod"
+      android:value="androidx.test.espresso.remote.EspressoRemote#remoteInit"/>
   </instrumentation>
 
 </manifest>
diff --git a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_private.xml b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_private.xml
index ba17e3dd3..1a5f3a2d2 100644
--- a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_private.xml
+++ b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_private.xml
@@ -24,15 +24,12 @@
 
   <instrumentation
     android:name="androidx.test.runner.AndroidJUnitRunner"
-    android:targetPackage="androidx.test.multiprocess.app">
+    android:targetPackage="androidx.test.multiprocess.app"
+    android:targetProcesses="androidx.test.multiprocess.app:PID2">
 
-    <!-- explicitly instrument private process: -->
     <meta-data
-      android:name="targetProcess"
-      android:value="androidx.test.multiprocess.app:PID2"/>
-
-    <!-- TODO: change to the syntax after next emulator image update -->
-    <!--android:targetProcess=":PID2"-->
+      android:name="remoteMethod"
+      android:value="androidx.test.espresso.remote.EspressoRemote#remoteInit"/>
   </instrumentation>
 
 </manifest>
diff --git a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/BUILD b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/BUILD
index cd0a71807..ea1115d0b 100644
--- a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/BUILD
+++ b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/BUILD
@@ -17,7 +17,7 @@ licenses(["notice"])
 # Tests
 # =========================================================
 
-DEVICES = devices([23])
+DEVICES = devices([28])
 
 axt_android_application_test(
     name = "DefaultProcessActivityTest",