diff --git a/prebuilts/gradle/DocumentCentricApps/Application/tests/src/com/example/android/documentcentricapps/tests/DocumentCentricAppsInstrumentationTest.java b/prebuilts/gradle/DocumentCentricApps/Application/tests/src/com/example/android/documentcentricapps/tests/DocumentCentricAppsInstrumentationTest.java
index 3701f22..61b25ed 100644
--- a/prebuilts/gradle/DocumentCentricApps/Application/tests/src/com/example/android/documentcentricapps/tests/DocumentCentricAppsInstrumentationTest.java
+++ b/prebuilts/gradle/DocumentCentricApps/Application/tests/src/com/example/android/documentcentricapps/tests/DocumentCentricAppsInstrumentationTest.java
@@ -16,16 +16,17 @@
 
 package com.example.android.documentcentricapps.tests;
 
-import com.example.android.documentcentricapps.DocumentCentricActivity;
-import com.example.android.documentcentricapps.R;
-
 import android.app.ActivityManager;
 import android.content.Context;
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.TouchUtils;
-import android.test.suitebuilder.annotation.LargeTest;
 import android.widget.Button;
 
+import androidx.test.filters.LargeTest;
+
+import com.example.android.documentcentricapps.DocumentCentricActivity;
+import com.example.android.documentcentricapps.R;
+
 import java.util.List;
 
 /**
diff --git a/prebuilts/gradle/DocumentCentricApps/Application/tests/src/com/example/android/documentcentricapps/tests/DocumentCentricAppsUnitTest.java b/prebuilts/gradle/DocumentCentricApps/Application/tests/src/com/example/android/documentcentricapps/tests/DocumentCentricAppsUnitTest.java
index b3da974..a3b803f 100644
--- a/prebuilts/gradle/DocumentCentricApps/Application/tests/src/com/example/android/documentcentricapps/tests/DocumentCentricAppsUnitTest.java
+++ b/prebuilts/gradle/DocumentCentricApps/Application/tests/src/com/example/android/documentcentricapps/tests/DocumentCentricAppsUnitTest.java
@@ -16,15 +16,16 @@
 
 package com.example.android.documentcentricapps.tests;
 
-import com.example.android.documentcentricapps.DocumentCentricActivity;
-import com.example.android.documentcentricapps.R;
-
 import android.content.Intent;
 import android.test.ActivityUnitTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
 import android.widget.Button;
 import android.widget.CheckBox;
 
+import androidx.test.filters.MediumTest;
+
+import com.example.android.documentcentricapps.DocumentCentricActivity;
+import com.example.android.documentcentricapps.R;
+
 /**
  * Unit tests for DocumentCentricApps sample.
  */
diff --git a/prebuilts/gradle/PdfRendererBasic/Application/tests/src/com/example/android/pdfrendererbasic/tests/PdfRendererBasicFragmentTests.java b/prebuilts/gradle/PdfRendererBasic/Application/tests/src/com/example/android/pdfrendererbasic/tests/PdfRendererBasicFragmentTests.java
index 0f94cbf..c97579f 100644
--- a/prebuilts/gradle/PdfRendererBasic/Application/tests/src/com/example/android/pdfrendererbasic/tests/PdfRendererBasicFragmentTests.java
+++ b/prebuilts/gradle/PdfRendererBasic/Application/tests/src/com/example/android/pdfrendererbasic/tests/PdfRendererBasicFragmentTests.java
@@ -19,10 +19,11 @@
 import android.content.pm.ActivityInfo;
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.TouchUtils;
-import android.test.suitebuilder.annotation.LargeTest;
 import android.view.View;
 import android.widget.Button;
 
+import androidx.test.filters.LargeTest;
+
 import com.example.android.pdfrendererbasic.MainActivity;
 import com.example.android.pdfrendererbasic.PdfRendererBasicFragment;
 import com.example.android.pdfrendererbasic.R;