Snap for 11791273 from 11e07f07054a844e2cd9185829dba1059de720b5 to emu-35-1-releaseemu-35-1-release

Change-Id: I687ae6f8dbc70861d0b3f3c1e85b3329861fe4c5
author: Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 2024-05-02 16:43:57 +0000
committer: Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 2024-05-02 16:43:57 +0000
commit: 5aa6a42b7b18f32c84ab85bb03a9985ec5c7a3be (patch)
tree: df61a2d604ee2ef5c797ef9a66ec29a76fffe500
parent: 0ba1409ac12274b67de8c40fd09e5247a5329153 (diff)
parent: 11e07f07054a844e2cd9185829dba1059de720b5 (diff)
download: adt-infra-emu-35-1-release.tar.gz
187 files changed, 1104 insertions, 941 deletions
diff --git a/emu_test/test_ui/test_ui.py b/emu_test/test_ui/test_ui.py
index d36969b2..08ceb050 100644
--- a/emu_test/test_ui/test_ui.py
+++ b/emu_test/test_ui/test_ui.py
@@ -55,7 +55,7 @@ class UiAutomatorBaseTestCase(EmuBaseTestCase):
             self.kill_proc_by_name(["crash-service", "adb"])
             os.remove(os.path.join(avd_dir, '%s.ini' % self.avd_config.name()))
             if sys.platform == "win32":
-                rm_avd = "rmdir /s /q " + os.path.join(avd_dir, '%s.avd' % self.avd_config.name()) 
+                rm_avd = "rmdir /s /q " + os.path.join(avd_dir, '%s.avd' % self.avd_config.name())
                 os.system(rm_avd)
             else:
                 shutil.rmtree(os.path.join(avd_dir, '%s.avd' % self.avd_config.name()), ignore_errors=True)
@@ -81,9 +81,10 @@ class UiAutomatorBaseTestCase(EmuBaseTestCase):
             self.m_logger.info('Failed to find gradle XML reports.')
         else:
             xml_file = ''
-            for filename in os.listdir(gradle_report_path):
-                if filename.endswith('.xml'):
-                    xml_file = filename
+            for path, subdirs, files in os.walk(gradle_report_path):
+                for filename in files:
+                    if filename.endswith('.xml'):
+                      xml_file = os.path.join(path, filename)
             if not xml_file:
                 self.m_logger.info('Failed to find gradle XML report.')
                 return
@@ -91,7 +92,7 @@ class UiAutomatorBaseTestCase(EmuBaseTestCase):
             dst_file = os.path.join(emu_args.session_dir, emu_args.test_dir, test_method + '.xml')
             if os.path.isfile(dst_file):
                 os.remove(dst_file)
-            shutil.copyfile(src_file, dst_file)
+            shutil.copyfile(xml_file, dst_file)
 
     def _save_adb_bug_report(self, test_method):
         adb_binary = path_utils.get_adb_binary()
@@ -106,7 +107,7 @@ class UiAutomatorBaseTestCase(EmuBaseTestCase):
         self.m_logger.info('Pull details from sdcard')
         dst_path = os.path.join(emu_args.session_dir, emu_args.test_dir, test_method + '_details')
         p = psutil.Popen([adb_binary, 'pull',
-                          '/sdcard/Logs', dst_path],
+                          '/sdcard/Documents/Logs', dst_path],
                          stdout=PIPE, stderr=PIPE)
         (out, err) = p.communicate()
         self.m_logger.info('adb_pull_stdout:\n' + out.decode())
@@ -146,9 +147,9 @@ class UiAutomatorBaseTestCase(EmuBaseTestCase):
         test_ori = test_args_prefix + '.origin=' + avd.ori
         self.m_logger.info('Calling gradle with cwd %r params: %r', self.uitest_dir,
                            [self.gradle, 'cAT', test_class, test_api, test_abi, test_tag,
-                            test_ori, '--stacktrace'])
+                            test_ori, '--stacktrace', '--info'])
         return psutil.Popen([self.gradle, 'cAT', test_class, test_api, test_abi, test_tag,
-                             test_ori, '--stacktrace'], cwd=self.uitest_dir, stdout=PIPE, stderr=PIPE,
+                             test_ori, '--stacktrace', '--info'], cwd=self.uitest_dir, stdout=PIPE, stderr=PIPE,
                             shell=self.use_shell)
 
     def _launch_ui_test_with_avd_configs(self, avd):
@@ -195,7 +196,7 @@ class UiAutomatorBaseTestCase(EmuBaseTestCase):
         """
         self.launch_emu_and_wait(avd)
         self.m_logger.info('System image UI tests (%s) start.' % self._testMethodName)
-        if os.name is 'nt':
+        if os.name == 'nt':
             self.gradle = 'gradlew.bat'
             self.use_shell = True
         else:
diff --git a/pytest/test_embedded/cfg/emulator_darwin_tests.json b/pytest/test_embedded/cfg/emulator_darwin_tests.json
index aeb538bb..780cf813 100644
--- a/pytest/test_embedded/cfg/emulator_darwin_tests.json
+++ b/pytest/test_embedded/cfg/emulator_darwin_tests.json
@@ -187,38 +187,6 @@
         },
         "status": "enabled"
     },
-    "foldable_emulator_test_suite_api_31": {
-        "description": "Set of tests that verify that the foldable emulator works as expected.",
-        "launch_flags": [],
-        "pytest_flags": [
-            "-m foldable"
-        ],
-        "avd_config": {
-            "api": "31",
-            "tag.id": "google_apis",
-            "hw.device.name": "pixel_fold",
-            "hw.displayRegion.0.1.height": "2092",
-            "hw.displayRegion.0.1.width": "1080",
-            "hw.displayRegion.0.1.xOffset": "0",
-            "hw.displayRegion.0.1.yOffset": "0",
-            "hw.initialOrientation": "landscape",
-            "hw.lcd.density": "420",
-            "hw.lcd.height": "1840",
-            "hw.lcd.width": "2208",
-            "hw.sensor.hinge": "yes",
-            "hw.sensor.hinge.areas": "1080-0-0-1840",
-            "hw.sensor.hinge.count": "1",
-            "hw.sensor.hinge.defaults": "180",
-            "hw.sensor.hinge.ranges": "0-180",
-            "hw.sensor.hinge.sub_type": "1",
-            "hw.sensor.hinge.type": "1",
-            "hw.sensor.hinge_angles_posture_definitions": "0-30, 30-150, 150-180",
-            "hw.sensor.posture_list": "1, 2, 3",
-            "hw.sensors.orientation": "yes",
-            "hw.sensors.proximity": "yes"
-        },
-        "status": "enabled"
-    },
     "resizable_emulator_test_suite_api_34": {
         "description": "Set of tests related to a resizable avd. Uses a resizable avd configuration.",
         "launch_flags": [],
@@ -355,6 +323,18 @@
         },
         "status": "enabled"
     },
+    "sanity_test_suite_api_25": {
+        "description": "Set of tests we want to run as a part of emulator sanity test suite",
+        "launch_flags": [],
+        "pytest_flags": [
+            "-m oldapiboot"
+        ],
+        "avd_config": {
+            "api": "25",
+            "tag.id": "google_apis"
+        },
+        "status": "enabled"
+    },
     "fast_test_suite_api_31": {
         "description": "Set of tests we want to run as a part of emulator fast test suite",
         "launch_flags": [],
diff --git a/pytest/test_embedded/cfg/emulator_linux_tests.json b/pytest/test_embedded/cfg/emulator_linux_tests.json
index aeb538bb..780cf813 100644
--- a/pytest/test_embedded/cfg/emulator_linux_tests.json
+++ b/pytest/test_embedded/cfg/emulator_linux_tests.json
@@ -187,38 +187,6 @@
         },
         "status": "enabled"
     },
-    "foldable_emulator_test_suite_api_31": {
-        "description": "Set of tests that verify that the foldable emulator works as expected.",
-        "launch_flags": [],
-        "pytest_flags": [
-            "-m foldable"
-        ],
-        "avd_config": {
-            "api": "31",
-            "tag.id": "google_apis",
-            "hw.device.name": "pixel_fold",
-            "hw.displayRegion.0.1.height": "2092",
-            "hw.displayRegion.0.1.width": "1080",
-            "hw.displayRegion.0.1.xOffset": "0",
-            "hw.displayRegion.0.1.yOffset": "0",
-            "hw.initialOrientation": "landscape",
-            "hw.lcd.density": "420",
-            "hw.lcd.height": "1840",
-            "hw.lcd.width": "2208",
-            "hw.sensor.hinge": "yes",
-            "hw.sensor.hinge.areas": "1080-0-0-1840",
-            "hw.sensor.hinge.count": "1",
-            "hw.sensor.hinge.defaults": "180",
-            "hw.sensor.hinge.ranges": "0-180",
-            "hw.sensor.hinge.sub_type": "1",
-            "hw.sensor.hinge.type": "1",
-            "hw.sensor.hinge_angles_posture_definitions": "0-30, 30-150, 150-180",
-            "hw.sensor.posture_list": "1, 2, 3",
-            "hw.sensors.orientation": "yes",
-            "hw.sensors.proximity": "yes"
-        },
-        "status": "enabled"
-    },
     "resizable_emulator_test_suite_api_34": {
         "description": "Set of tests related to a resizable avd. Uses a resizable avd configuration.",
         "launch_flags": [],
@@ -355,6 +323,18 @@
         },
         "status": "enabled"
     },
+    "sanity_test_suite_api_25": {
+        "description": "Set of tests we want to run as a part of emulator sanity test suite",
+        "launch_flags": [],
+        "pytest_flags": [
+            "-m oldapiboot"
+        ],
+        "avd_config": {
+            "api": "25",
+            "tag.id": "google_apis"
+        },
+        "status": "enabled"
+    },
     "fast_test_suite_api_31": {
         "description": "Set of tests we want to run as a part of emulator fast test suite",
         "launch_flags": [],
diff --git a/pytest/test_embedded/cfg/emulator_windows_tests.json b/pytest/test_embedded/cfg/emulator_windows_tests.json
index 458aa2f1..8045cec4 100644
--- a/pytest/test_embedded/cfg/emulator_windows_tests.json
+++ b/pytest/test_embedded/cfg/emulator_windows_tests.json
@@ -187,38 +187,6 @@
         },
         "status": "enabled"
     },
-    "foldable_emulator_test_suite_api_31": {
-        "description": "Set of tests that verify that the foldable emulator works as expected.",
-        "launch_flags": [],
-        "pytest_flags": [
-            "-m foldable"
-        ],
-        "avd_config": {
-            "api": "31",
-            "tag.id": "google_apis",
-            "hw.device.name": "pixel_fold",
-            "hw.displayRegion.0.1.height": "2092",
-            "hw.displayRegion.0.1.width": "1080",
-            "hw.displayRegion.0.1.xOffset": "0",
-            "hw.displayRegion.0.1.yOffset": "0",
-            "hw.initialOrientation": "landscape",
-            "hw.lcd.density": "420",
-            "hw.lcd.height": "1840",
-            "hw.lcd.width": "2208",
-            "hw.sensor.hinge": "yes",
-            "hw.sensor.hinge.areas": "1080-0-0-1840",
-            "hw.sensor.hinge.count": "1",
-            "hw.sensor.hinge.defaults": "180",
-            "hw.sensor.hinge.ranges": "0-180",
-            "hw.sensor.hinge.sub_type": "1",
-            "hw.sensor.hinge.type": "1",
-            "hw.sensor.hinge_angles_posture_definitions": "0-30, 30-150, 150-180",
-            "hw.sensor.posture_list": "1, 2, 3",
-            "hw.sensors.orientation": "yes",
-            "hw.sensors.proximity": "yes"
-        },
-        "status": "enabled"
-    },
     "resizable_emulator_test_suite_api_34": {
         "description": "Set of tests related to a resizable avd. Uses a resizable avd configuration.",
         "launch_flags": [],
@@ -355,6 +323,18 @@
         },
         "status": "enabled"
     },
+    "sanity_test_suite_api_25": {
+        "description": "Set of tests we want to run as a part of emulator sanity test suite",
+        "launch_flags": [],
+        "pytest_flags": [
+            "-m oldapiboot"
+        ],
+        "avd_config": {
+            "api": "25",
+            "tag.id": "google_apis"
+        },
+        "status": "enabled"
+    },
     "fast_test_suite_api_31": {
         "description": "Set of tests we want to run as a part of emulator fast test suite",
         "launch_flags": [],
diff --git a/pytest/test_embedded/pytest.ini b/pytest/test_embedded/pytest.ini
index a3d9f028..6a79afaa 100644
--- a/pytest/test_embedded/pytest.ini
+++ b/pytest/test_embedded/pytest.ini
@@ -37,6 +37,7 @@ markers =
     fast: set of emulator fast suite tests
     xpass: chrome tests
     netsim: Netsim emulator tests
+    oldapiboot: marks tests that should run on old api
 testpaths =
     tests
 
diff --git a/pytest/test_embedded/tests/conftest.py b/pytest/test_embedded/tests/conftest.py
index f0c1bb54..164d5958 100644
--- a/pytest/test_embedded/tests/conftest.py
+++ b/pytest/test_embedded/tests/conftest.py
@@ -413,7 +413,6 @@ async def emulator(request, pytestconfig) -> BaseEmulator:
 
     if emu.is_alive():
         await emu.stop()
-    assert not emu.is_alive()
 
     return emu
 
diff --git a/pytest/test_embedded/tests/console/test_multidisplay_console.py b/pytest/test_embedded/tests/console/test_multidisplay_console.py
new file mode 100644
index 00000000..20f04ae3
--- /dev/null
+++ b/pytest/test_embedded/tests/console/test_multidisplay_console.py
@@ -0,0 +1,53 @@
+from pathlib import Path
+
+import pytest
+import logging
+import random
+import asyncio
+import emu.console.emulator_connection
+
+from aemu.proto.ui_controller_service_pb2 import PaneEntry, WindowPosition
+from aemu.proto.ui_controller_service_pb2_grpc import UiControllerStub
+from google.protobuf import empty_pb2
+
+__EMPTY__ = empty_pb2.Empty()
+
+@pytest.fixture
+def ui_controller(service):
+    yield service(UiControllerStub)
+
+
+@pytest.mark.console
+@pytest.mark.multidisplay
+@pytest.mark.e2e
+@pytest.mark.async_timeout(10)
+async def test_multidisplay_out_of_order_add_no_crash(avd, telnet, ui_controller):
+    """Test adb emu multidisplay add 3  does not crash emulator"""
+
+    await ui_controller.closeExtendedControls(__EMPTY__)
+    x = random.randrange(800, 1200)
+    y = random.randrange(400, 500)
+    controlStatus = await ui_controller.showExtendedControls(
+        PaneEntry(
+            position=WindowPosition(
+                x=x,
+                y=y,
+                horizontalAnchor=WindowPosition.HCENTER,
+                verticalAnchor=WindowPosition.BOTTOM,
+            )
+        )
+    )
+
+    # We became visible.
+    assert controlStatus.visibilityChanged
+
+    out_of_order_add_result =await telnet.send("multidisplay add 3 720 1280 240 0")
+    await asyncio.sleep(2)
+    assert avd.is_alive();
+    assert "OK" in out_of_order_add_result
+
+    valid_del_result = await telnet.send("multidisplay del 3")
+    await asyncio.sleep(2)
+    assert avd.is_alive();
+    assert "OK" in valid_del_result
+
diff --git a/pytest/test_embedded/tests/display/test_multi_display.py b/pytest/test_embedded/tests/display/test_multi_display.py
index 4690d40f..4b16fc65 100644
--- a/pytest/test_embedded/tests/display/test_multi_display.py
+++ b/pytest/test_embedded/tests/display/test_multi_display.py
@@ -14,12 +14,17 @@
 import logging
 import asyncio
 import pytest
+import re
 from aemu.proto.emulator_controller_pb2 import (
     DisplayConfiguration,
     DisplayConfigurations,
     ImageFormat,
     Rotation,
 )
+from aemu.proto.emulator_controller_pb2_grpc import EmulatorControllerStub
+from emu.emulator import Emulator
+from emu.timing import eventually
+from functools import partial
 from google.protobuf import empty_pb2
 from grpc import RpcError, StatusCode
 from tests.test_utils import fmt_proto
@@ -86,7 +91,7 @@ async def emu_snapshot_service(avd, service):
 @pytest.mark.timeout_win(timeout=60)
 @pytest.mark.graphics
 @pytest.mark.multidisplay
-async def test_multidisplay_none(no_displays, emulator_controller, is_landscape):
+async def test_multidisplay_none(avd, no_displays, emulator_controller, is_landscape):
     """Erasing displays leaves nothing behind."""
     if is_landscape:
         pytest.skip("Cannot run multi display tests in landscape mode.")
@@ -103,7 +108,7 @@ async def test_multidisplay_none(no_displays, emulator_controller, is_landscape)
 @pytest.mark.graphics
 @pytest.mark.multidisplay
 @pytest.mark.sanity
-async def test_multidisplay_multiple(no_displays, emulator_controller, is_landscape):
+async def test_multidisplay_multiple(avd, no_displays, emulator_controller, is_landscape):
     """Adding a display should work."""
     if is_landscape:
         pytest.skip("Cannot run multi display tests in landscape mode.")
@@ -127,7 +132,6 @@ async def test_multidisplay_multiple(no_displays, emulator_controller, is_landsc
 @pytest.mark.multidisplay
 @pytest.mark.sanity
 @pytest.mark.async_timeout(510)
-@pytest.mark.flaky # b/331456513
 async def test_multiple_display_snapshot(avd, no_displays, emulator_controller, emu_snapshot_service,  is_landscape):
     """Snapshots on multiple display should work."""
     if is_landscape:
@@ -173,7 +177,7 @@ async def test_multiple_display_snapshot(avd, no_displays, emulator_controller,
 @pytest.mark.graphics
 @pytest.mark.multidisplay
 async def test_multidisplay_multiple_error(
-    no_displays, emulator_controller, is_landscape
+    avd, no_displays, emulator_controller, is_landscape
 ):
     """A failure should not modify the status."""
     if is_landscape:
@@ -217,7 +221,7 @@ async def test_multidisplay_multiple_error(
 @pytest.mark.multidisplay
 @pytest.mark.fast
 async def test_multidisplay_get_after_set(
-    no_displays, emulator_controller, is_landscape
+    avd, no_displays, emulator_controller, is_landscape
 ):
     """Adding a display should work."""
     if is_landscape:
@@ -239,7 +243,7 @@ async def test_multidisplay_get_after_set(
 @pytest.mark.graphics
 @pytest.mark.multidisplay
 async def test_multidisplay_double_ids_error(
-    no_displays, emulator_controller, is_landscape
+    avd, no_displays, emulator_controller, is_landscape
 ):
     """Adding the same display twice should result in an error."""
     if is_landscape:
@@ -263,7 +267,7 @@ async def test_multidisplay_double_ids_error(
 @pytest.mark.fast
 @pytest.mark.flaky  # b/322551553
 async def test_multidisplay_can_configure_four(
-    no_displays, emulator_controller, is_landscape
+    avd, no_displays, emulator_controller, is_landscape
 ):
     """This tests makes sure that a total of 4 displays can be configured.
 
@@ -296,7 +300,7 @@ async def test_multidisplay_can_configure_four(
 @pytest.mark.graphics
 @pytest.mark.multidisplay
 async def test_multidisplay_add_should_not_remove(
-    no_displays, emulator_controller, is_landscape
+    avd, no_displays, emulator_controller, is_landscape
 ):
     """This tests makes sure that a total of 4 displays can be configured.
 
@@ -336,7 +340,7 @@ async def test_multidisplay_add_should_not_remove(
 @pytest.mark.graphics
 @pytest.mark.multidisplay
 async def test_multidisplay_error_too_many(
-    no_displays, emulator_controller, is_landscape
+    avd, no_displays, emulator_controller, is_landscape
 ):
     """Adding too many displays should raise an exception."""
     if is_landscape:
@@ -351,3 +355,94 @@ async def test_multidisplay_error_too_many(
         await emulator_controller.setDisplayConfigurations(
             DisplayConfigurations(displays=displays)
         )
+
+
+@pytest.mark.graphics
+@pytest.mark.multidisplay
+@pytest.mark.fast
+@pytest.mark.async_timeout(120)
+async def test_disable_multidisplay(avd, is_landscape):
+    """Ensure an app is moved to the primary display when multidisplay is disabled.
+
+    Args:
+        emulator (BaseEmulator): Fixture that gives access to the running emulator.
+        is_landscape (bool): Fixture that indicates whether the emulator is in landscape orientation.
+        emulator_controller (EmulatorControllerStub): An instance of the emulator controller fixture.
+
+    Test UUID: d0114791-2781-45ee-b4fa-b496d767604e
+
+    Test Steps:
+        1. Configure the emulator to support multiple display resolutions.
+        2. Launch a dummy app (e.g., calendar) on the current display.
+        3. Disable multidisplay functionality
+        4. confirm the dummy app moved to the primary display (Verify).
+        5. Repeat the steps 2-4 for all display resolutions
+
+    Verify:
+        - Ensure that the secondary display is removed after disabling multidisplay.
+        - Verify that the app running on the secondary display is correctly moved to the primary display.
+    """
+    if is_landscape:
+        pytest.skip("Cannot run multi display tests in landscape mode.")
+
+    emulator_controller = EmulatorControllerStub(avd.channel)
+
+    # Displays configurations to be tested.
+    resolutions = [(720, 1280), (1080, 1920)]
+    displays = [
+        DisplayConfiguration(width=x[0], height=x[1], dpi=213, display=idx + 1)
+            for idx, x in enumerate(resolutions)
+    ]
+
+    async def disable_multidisplay():
+        # Ensure the device has only one display
+        cfg = await emulator_controller.setDisplayConfigurations(
+            DisplayConfigurations(displays=[])
+        )
+        logging.info('Disabling multidisplay mode')
+        assert len(cfg.displays) == 1
+        return cfg
+
+    async def enable_multidisplay(displays):
+        # Set the display configuration according to `displays`
+        to_set = DisplayConfigurations(displays=displays)
+        logging.info('Enabling multidisplay mode')
+        cfg = await emulator_controller.setDisplayConfigurations(to_set)
+        return cfg
+
+    async def get_display_id(package):
+        # Get the display id where `package` is running
+        windows_dump = await avd.adb.shell("dumpsys window", timeout=30)
+        display_lines = re.search(f"Window.*{package}.*mDisplayId=([0-9]*)", windows_dump)
+        return int(display_lines.groups()[0])
+
+    dummy_pkg = "com.android.contacts"
+    dummy_activity = f"{dummy_pkg}/.activities.PeopleActivity"
+
+    # Make sure we start with the primary display only.
+    cfg = await emulator_controller.getDisplayConfigurations(empty_pb2.Empty())
+    if len(cfg.displays) > 1:
+        await disable_multidisplay()
+
+    for idx in range(len(resolutions)):
+
+        # Enable multidisplay.
+        await enable_multidisplay(displays)
+        await asyncio.sleep(10)
+
+        # Start app on current display.
+        await avd.start_activity(dummy_activity, params=f"--display {idx + 1}")
+        await asyncio.sleep(10)
+
+        # Disable multidisplay.
+        logging.info(f'Disable multidisplay while contacts app is on display {idx + 1}')
+        cfg = await disable_multidisplay()
+        await asyncio.sleep(10)
+
+        # Verify if the app is present in the primary display.
+        display_id = await get_display_id(dummy_pkg)
+        assert display_id == 0, f"Contacts app was detected in display {display_id}"
+
+        # Stop the app.
+        await avd.stop_activity("com.android.contacts")
+        await asyncio.sleep(5)
diff --git a/pytest/test_embedded/tests/graphics/test_chrome.py b/pytest/test_embedded/tests/graphics/test_chrome.py
index 9b02db80..cf373de3 100644
--- a/pytest/test_embedded/tests/graphics/test_chrome.py
+++ b/pytest/test_embedded/tests/graphics/test_chrome.py
@@ -33,9 +33,9 @@ purple_html = """
   </head>
 </html>
 """
-purple_path = f"/sdcard/Android/data/{chrome_pkg}/files/Download/purple.html"
+purple_path = f"/sdcard/Android/data/{chrome_pkg}/files/Download"
+
 
-@pytest.fixture
 async def prepare_chrome(avd):
     """
     Pytest fixture that launches Chrome and configures it
@@ -44,11 +44,13 @@ async def prepare_chrome(avd):
     This fixture prepares the Chrome application on an
     Android Virtual Device (AVD) for testing.
     """
-
+    await avd.adb.shell("pm clear com.android.chrome")
     # Put purple.html on the device.
-    await avd.adb.shell(
-        f'echo "{purple_html}" > {purple_path}'
-    )
+    await avd.adb.shell(f'mkdir -p {purple_path}')
+    await avd.adb.shell(f'echo "{purple_html}" > {purple_path}/purple.html')
+
+    await avd.adb.shell("pm grant com.android.chrome android.permission.POST_NOTIFICATIONS")
+    await avd.adb.shell("pm grant com.android.chrome android.permission.READ_EXTERNAL_STORAGE")
 
     # Configure to skip welcome page
     await avd.adb.shell(
@@ -56,37 +58,23 @@ async def prepare_chrome(avd):
     )
     await avd.adb.shell("am set-debug-app --persistent com.android.chrome")
 
-    # Start Chrome for the first time
-    await avd.start_activity(chrome_cmp)
-
-    # Kill and restart to skip a pop-up
-    await avd.stop_activity(chrome_pkg)
-    await avd.start_activity(chrome_cmp)
-    await avd.adb.shell(
-        f"am start -a android.intent.action.VIEW -d http://www.google.com -n {chrome_cmp}"
-    )
-
-    yield
-
+    await avd.adb.shell(f"am start -a android.intent.action.VIEW -d http://www.google.com -n {chrome_cmp}")
     await avd.stop_activity(chrome_pkg)
 
 
 async def request_page_in_chrome(avd):
-    await avd.stop_activity(chrome_pkg)
-    await avd.start_activity(chrome_cmp)
-    await avd.adb.shell(
-        f"am start -a android.intent.action.VIEW -d 'file:///{purple_path}' -t text/html -n {chrome_cmp}"
-    )
+    await prepare_chrome(avd)
+    await avd.adb.shell(f"am start -S -a android.intent.action.VIEW -d 'file:///{purple_path}/purple.html' -t text/html -n {chrome_cmp}")
 
 
 @pytest.mark.e2e
-@pytest.mark.flaky
 @pytest.mark.graphics
 @pytest.mark.xpass
-async def test_launch_chrome_google(prepare_chrome, avd, get_screenshot):
+@pytest.mark.flaky
+async def test_launch_chrome_google(avd, get_screenshot):
     """
     This test launches Chrome on an Android device, opens a html snippet,
-    captures a screenshot, and verifies that at least 40% of the image pixels are purple.
+    captures a screenshot, and verifies that at least 60% of the image pixels are purple.
     """
     async def at_least_60_percent_of_image_is_purple():
         """
@@ -108,16 +96,19 @@ async def test_launch_chrome_google(prepare_chrome, avd, get_screenshot):
                 r, g, b = rgb_image.getpixel((x, y))
 
                 # Check if the pixel corresponds to the desired shade of purple
-                if r == 255 and g == 0 and b == 255:
+                if r > 245 and g < 10 and b > 245:
                     purple_count += 1
         return purple_count > (rgb_image.width * rgb_image.height * percent_purple / 100)
 
+    saw_purple = False
+    # Weird that the file access permissions are not granted on the first try.
+    # But it is ok to retry since that is not the focus of this test.
     max_retries = 3
     for _ in range(0, max_retries):
         await request_page_in_chrome(avd)
         if await wait_until(at_least_60_percent_of_image_is_purple, timeout=5):
-            return
+            saw_purple = True
+            break
 
-    assert (
-        False
-    ), f"Did not see a screenshot with 60%% purple pixels with {max_retries} retries"
+    assert (saw_purple), f"Did not see a screenshot with 60%% purple pixels"
+    await avd.stop_activity(chrome_pkg)
diff --git a/pytest/test_embedded/tests/test_boot.py b/pytest/test_embedded/tests/test_boot.py
index e87b0b53..7250003e 100644
--- a/pytest/test_embedded/tests/test_boot.py
+++ b/pytest/test_embedded/tests/test_boot.py
@@ -14,6 +14,9 @@
 import asyncio
 import logging
 import platform
+import re
+import subprocess
+import tempfile
 from pathlib import Path
 
 import psutil
@@ -143,6 +146,7 @@ def check_boot_from_snapshot(avdpath) -> bool:
 @pytest.mark.e2e
 @pytest.mark.sanity
 @pytest.mark.timeout_win(timeout=120)
+@pytest.mark.skipos("all", "Test fails in presubmit")
 async def test_snapshot_booted(emulator):
     """Make sure the emulator status is able to boot from snapshot.
 
@@ -222,3 +226,80 @@ async def test_emulator_should_idle(emulator):
 async def test_a_booted_emulator_immediately_notifies_it_has_booted(avd):
     assert await avd.has_booted()
     assert await asyncio.wait_for(get_booted_notification_time(avd), timeout=10)
+
+@pytest.mark.boot
+@pytest.mark.fast
+@pytest.mark.async_timeout(180)
+@pytest.mark.flaky
+async def test_emulator_debug_startup(avd):
+    """Ensure the emulator is able to launch with DEBUG messages.
+
+    Args:
+        avd (BaseEmulator): Fixture that gives access to a booted emulator.
+
+    Test UUID: a5fb9248-8bc8-43b2-ae22-22594b7888ad
+
+    Test steps:
+        1. From a subprocess run: emulator -help-debug-tags" (Verify 1).
+        2. From a subprocess run: emulator -debug all (Verify 2).
+
+    Verify:
+        1. A list of available debug tags are displayed.
+        2. The emulator launches with debug messages (observed from a stdout file).
+    """
+    # Check if the emulator binary prints the debug tags.
+    cmd = ' '.join((str(avd.exe), '-help-debug-tags'))
+    try:
+        output = subprocess.check_output(cmd, shell=True)
+        assert "-debug" in output.decode(), "Emulator debug flags not found"
+    except subprocess.CalledProcessError as e:
+        raise AssertionError(f"Command '{' '.join(cmd)}' failed with error: {e.output}")
+
+    # Check if the emulator output contains debug messages.
+
+    logging.info("Launching emulator with option 'debug -all' ...")
+
+    # Sample debug message format: D0412 07:53:41.641776.
+    debug_pattern = r"D\d{4} \d{2}:\d{2}:\d{2}\.\d{6}.*"
+
+    # Redirect the emulator stdout/stderr to a temporary file.
+    with tempfile.NamedTemporaryFile() as emu_output:
+        flags = ["-debug",
+                "all",
+                "-stdouterr-file",
+                emu_output.name,
+               "-no-snapshot-save"]
+
+        await avd.restart(flags)
+        await asyncio.sleep(5)
+
+        contents = emu_output.read().decode()
+        has_debug_messages = re.search(debug_pattern, contents)
+        assert has_debug_messages, "DEBUG messages not found in the emulator output"
+        logging.info(f"Found the debug message '{has_debug_messages.group()}'")
+
+
+@pytest.mark.oldapiboot
+@pytest.mark.e2e
+@pytest.mark.async_timeout(1080)
+async def test_first_time_booted_old_api(emulator):
+    """Make sure the emulator status is set to booted."""
+
+    logging.info("Launching emulator ...")
+    myflags = ["-wipe-data"]
+    if platform.processor() == "i386" and platform.system() == "Darwin":
+        myflags.append("-no-window")
+
+    assert await emulator.launch(flags=myflags)
+
+    logging.info("Waiting for it to boot up ...")
+    logging.info("Booting up emulator ...")
+    assert await emulator.wait_for_boot(timeout=900)
+
+    # wait till it settle down a bit
+    await asyncio.sleep(30)
+
+    logging.info("Shutting down the emulator ...")
+    if emulator.is_alive():
+        await emulator.stop()
+    logging.info("emulator is shut down successfully")
diff --git a/system_image_uitests/app/build.gradle b/system_image_uitests/app/build.gradle
index daae5a71..51a7ff0a 100644
--- a/system_image_uitests/app/build.gradle
+++ b/system_image_uitests/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdk 33
+    compileSdk 34
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     defaultConfig {
@@ -27,6 +27,8 @@ android {
     adbOptions {
         installOptions '-g'
     }
+
+    namespace 'com.android.devtools.systemimage.uitest'
 }
 
 dependencies {
@@ -36,7 +38,7 @@ dependencies {
     implementation 'androidx.test:runner:1.5.2'
     implementation 'androidx.test:rules:1.5.0'
     implementation 'com.google.guava:guava:31.0.1-jre'
-    implementation 'androidx.core:core:1.11.0-beta02'
+    implementation 'androidx.core:core:1.12.0'
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0'
     implementation 'org.dom4j:dom4j:2.1.3'
 
@@ -46,6 +48,5 @@ dependencies {
     androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-
     testImplementation 'org.hamcrest:hamcrest:2.2'
 }
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api18/GoogleServicesTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api18/GoogleServicesTest.java
index 5f497d1d..be710e25 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api18/GoogleServicesTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api18/GoogleServicesTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api18;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api18/MapsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api18/MapsTest.java
index ba53071e..552a3e31 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api18/MapsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api18/MapsTest.java
@@ -16,11 +16,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api18;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 import android.widget.EditText;
 import android.widget.ScrollView;
 import android.widget.TextView;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api18/NetworkIOTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api18/NetworkIOTest.java
index d44b9662..b7f5a85a 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api18/NetworkIOTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api18/NetworkIOTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api18;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api18/SettingsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api18/SettingsTest.java
index 58aa6eeb..6f577047 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api18/SettingsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api18/SettingsTest.java
@@ -17,12 +17,12 @@
 package com.android.devtools.systemimage.uitest.smoke.api18;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiObject2;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObject2;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api18/ShellUtilTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api18/ShellUtilTest.java
index d0707a96..bde141ac 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api18/ShellUtilTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api18/ShellUtilTest.java
@@ -17,7 +17,7 @@
 package com.android.devtools.systemimage.uitest.smoke.api18;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
+import androidx.test.runner.AndroidJUnit4;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.framework.SystemImageTestFramework;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api18/VpnTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api18/VpnTest.java
index 6288982a..0b18bd60 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api18/VpnTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api18/VpnTest.java
@@ -17,9 +17,9 @@
 package com.android.devtools.systemimage.uitest.smoke.api18;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/AddGoogleAccountTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/AddGoogleAccountTest.java
index 2b4de509..c4fa0efb 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/AddGoogleAccountTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/AddGoogleAccountTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api19;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/ApiDemosTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/ApiDemosTest.java
index 40fb8273..3130fc48 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/ApiDemosTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/ApiDemosTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api19;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/AppTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/AppTest.java
index a99e2175..ddf25d3b 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/AppTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/AppTest.java
@@ -17,12 +17,12 @@
 package com.android.devtools.systemimage.uitest.smoke.api19;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.By;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
-import.androidx.test.uiautomator.Until;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
+import androidx.test.uiautomator.Until;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/GoogleServicesTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/GoogleServicesTest.java
index 995b88ef..b3675fe6 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/GoogleServicesTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/GoogleServicesTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api19;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/MapsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/MapsTest.java
index e51ce8ba..dbbe7117 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/MapsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/MapsTest.java
@@ -16,10 +16,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api19;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/NetworkIOTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/NetworkIOTest.java
index 22c2925e..a7b22055 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/NetworkIOTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/NetworkIOTest.java
@@ -18,10 +18,10 @@ package com.android.devtools.systemimage.uitest.smoke.api19;
 
 import android.app.Instrumentation;
 import android.content.Context;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/SettingsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/SettingsTest.java
index 97fb966d..69c47865 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/SettingsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/SettingsTest.java
@@ -17,12 +17,12 @@
 package com.android.devtools.systemimage.uitest.smoke.api19;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiObject2;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObject2;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/ShellUtilTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/ShellUtilTest.java
index 60d14b28..93d89e22 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/ShellUtilTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api19/ShellUtilTest.java
@@ -17,7 +17,7 @@
 package com.android.devtools.systemimage.uitest.smoke.api19;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
+import androidx.test.runner.AndroidJUnit4;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.framework.SystemImageTestFramework;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/AddGoogleAccountTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/AddGoogleAccountTest.java
index 1dcce64b..aec07ac0 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/AddGoogleAccountTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/AddGoogleAccountTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api21;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiObjectNotFoundException;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/ApiDemosTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/ApiDemosTest.java
index 3cc2eb49..a6b9ccfe 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/ApiDemosTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/ApiDemosTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api21;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/AppTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/AppTest.java
index 33c00ad0..3f813c6e 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/AppTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/AppTest.java
@@ -17,12 +17,12 @@
 package com.android.devtools.systemimage.uitest.smoke.api21;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.By;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
-import.androidx.test.uiautomator.Until;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
+import androidx.test.uiautomator.Until;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/GoogleServicesTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/GoogleServicesTest.java
index 18935d99..e37d83f0 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/GoogleServicesTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/GoogleServicesTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api21;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/MapsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/MapsTest.java
index a838f3f4..c2f36279 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/MapsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/MapsTest.java
@@ -16,11 +16,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api21;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 import android.widget.EditText;
 import android.widget.ScrollView;
 import android.widget.TextView;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/NetworkIOTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/NetworkIOTest.java
index 3bcb5698..fa4c52e8 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/NetworkIOTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/NetworkIOTest.java
@@ -18,10 +18,10 @@ package com.android.devtools.systemimage.uitest.smoke.api21;
 
 import android.app.Instrumentation;
 import android.content.Context;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/SettingsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/SettingsTest.java
index 7fe191d8..f6864e93 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/SettingsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/SettingsTest.java
@@ -17,12 +17,12 @@
 package com.android.devtools.systemimage.uitest.smoke.api21;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiObject2;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObject2;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/ShellUtilTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/ShellUtilTest.java
index 84b87428..08bf41c6 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/ShellUtilTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/ShellUtilTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api21;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/VpnTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/VpnTest.java
index 8fabe773..180f34c8 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/VpnTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api21/VpnTest.java
@@ -17,9 +17,9 @@
 package com.android.devtools.systemimage.uitest.smoke.api21;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/AddGoogleAccountTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/AddGoogleAccountTest.java
index d6bd648a..a4630a8c 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/AddGoogleAccountTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/AddGoogleAccountTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api22;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiObjectNotFoundException;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/ApiDemosTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/ApiDemosTest.java
index 6ebd6895..8b7ac710 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/ApiDemosTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/ApiDemosTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api22;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/AppTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/AppTest.java
index f3a63ebf..4a4b2198 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/AppTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/AppTest.java
@@ -17,12 +17,12 @@
 package com.android.devtools.systemimage.uitest.smoke.api22;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.By;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
-import.androidx.test.uiautomator.Until;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
+import androidx.test.uiautomator.Until;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/GoogleServicesTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/GoogleServicesTest.java
index ce138d36..4ba8cd58 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/GoogleServicesTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/GoogleServicesTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api22;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/MapsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/MapsTest.java
index 61b77079..90b46bae 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/MapsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/MapsTest.java
@@ -16,10 +16,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api22;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.view.KeyEvent;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/NetworkIOTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/NetworkIOTest.java
index 9d9cca88..d9738213 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/NetworkIOTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/NetworkIOTest.java
@@ -18,10 +18,10 @@ package com.android.devtools.systemimage.uitest.smoke.api22;
 
 import android.app.Instrumentation;
 import android.content.Context;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/SettingsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/SettingsTest.java
index 94189a5a..79f2afd2 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/SettingsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/SettingsTest.java
@@ -17,12 +17,12 @@
 package com.android.devtools.systemimage.uitest.smoke.api22;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiObject2;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObject2;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/ShellUtilTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/ShellUtilTest.java
index 5201882a..f63d3f56 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/ShellUtilTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/ShellUtilTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api22;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/VpnTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/VpnTest.java
index 2b2da8df..a96d588a 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/VpnTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api22/VpnTest.java
@@ -17,9 +17,9 @@
 package com.android.devtools.systemimage.uitest.smoke.api22;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/AddGoogleAccountTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/AddGoogleAccountTest.java
index 8ffc22dd..87855192 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/AddGoogleAccountTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/AddGoogleAccountTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api23;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiObjectNotFoundException;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/ApiDemosTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/ApiDemosTest.java
index 420a23fe..3d1e0b49 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/ApiDemosTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/ApiDemosTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api23;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/AppTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/AppTest.java
index 80e6c97d..b34283a1 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/AppTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/AppTest.java
@@ -17,12 +17,12 @@
 package com.android.devtools.systemimage.uitest.smoke.api23;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.By;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
-import.androidx.test.uiautomator.Until;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
+import androidx.test.uiautomator.Until;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/GoogleServicesTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/GoogleServicesTest.java
index b2bdfa34..31e44caf 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/GoogleServicesTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/GoogleServicesTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api23;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/MapsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/MapsTest.java
index a3c3a0f4..476a6999 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/MapsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/MapsTest.java
@@ -16,10 +16,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api23;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.view.KeyEvent;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/NetworkIOTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/NetworkIOTest.java
index 7ab2892f..436bc8b8 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/NetworkIOTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/NetworkIOTest.java
@@ -18,12 +18,12 @@ package com.android.devtools.systemimage.uitest.smoke.api23;
 
 import android.app.Instrumentation;
 import android.content.Context;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiObjectNotFoundException;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/SettingsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/SettingsTest.java
index e3a680a7..7822ea38 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/SettingsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/SettingsTest.java
@@ -17,13 +17,13 @@
 package com.android.devtools.systemimage.uitest.smoke.api23;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiObject2;
-import.androidx.test.uiautomator.UiObjectNotFoundException;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObject2;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 import android.widget.LinearLayout;
 import android.widget.TextView;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/ShellUtilTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/ShellUtilTest.java
index 55f4435c..127d557c 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/ShellUtilTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/ShellUtilTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api23;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/VpnTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/VpnTest.java
index 29e45317..c5eb6fb8 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/VpnTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api23/VpnTest.java
@@ -17,9 +17,9 @@
 package com.android.devtools.systemimage.uitest.smoke.api23;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/AddGoogleAccountTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/AddGoogleAccountTest.java
index da4e2bfc..5cc986d4 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/AddGoogleAccountTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/AddGoogleAccountTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api24;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiObjectNotFoundException;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.framework.SystemImageTestFramework;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/ApiDemosTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/ApiDemosTest.java
index 3d21d5d2..131dd5af 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/ApiDemosTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/ApiDemosTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api24;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/AppTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/AppTest.java
index edf0d154..b729e522 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/AppTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/AppTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api24;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/CameraTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/CameraTest.java
index 62c39dc9..8a325358 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/CameraTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/CameraTest.java
@@ -17,7 +17,7 @@
 package com.android.devtools.systemimage.uitest.smoke.api24;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
+import androidx.test.runner.AndroidJUnit4;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.framework.SystemImageTestFramework;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/GoogleServicesTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/GoogleServicesTest.java
index 7f9f8f0b..507e911c 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/GoogleServicesTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/GoogleServicesTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api24;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/MapsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/MapsTest.java
index 017ec674..3a6d07ae 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/MapsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/MapsTest.java
@@ -16,11 +16,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api24;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 import android.widget.EditText;
 import android.widget.ScrollView;
 import android.widget.TextView;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/NetworkIOTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/NetworkIOTest.java
index 11764abf..5f2cdbf8 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/NetworkIOTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/NetworkIOTest.java
@@ -18,14 +18,14 @@ package com.android.devtools.systemimage.uitest.smoke.api24;
 
 import android.app.Instrumentation;
 import android.content.Context;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.By;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiObjectNotFoundException;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
-import.androidx.test.uiautomator.Until;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
+import androidx.test.uiautomator.Until;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/PlayStoreTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/PlayStoreTest.java
index e937fdc2..8f840e61 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/PlayStoreTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/PlayStoreTest.java
@@ -17,9 +17,9 @@
 package com.android.devtools.systemimage.uitest.smoke.api24;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/SettingsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/SettingsTest.java
index db2c9abf..be0d5028 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/SettingsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/SettingsTest.java
@@ -17,13 +17,13 @@
 package com.android.devtools.systemimage.uitest.smoke.api24;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiObject2;
-import.androidx.test.uiautomator.UiObjectNotFoundException;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObject2;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 import android.widget.LinearLayout;
 import android.widget.TextView;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/ShellUtilTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/ShellUtilTest.java
index 71f16f90..f9315184 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/ShellUtilTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/ShellUtilTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api24;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/VpnTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/VpnTest.java
index 6d70778e..f4925023 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/VpnTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/VpnTest.java
@@ -17,9 +17,9 @@
 package com.android.devtools.systemimage.uitest.smoke.api24;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/YouTubeTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/YouTubeTest.java
index 8a4a239f..956ce0b6 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/YouTubeTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api24/YouTubeTest.java
@@ -1,10 +1,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api24;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/AddGoogleAccountTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/AddGoogleAccountTest.java
index 28856a50..f2c3c5cb 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/AddGoogleAccountTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/AddGoogleAccountTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api25;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.framework.SystemImageTestFramework;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/ApiDemosTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/ApiDemosTest.java
index cca9c13f..d78d7599 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/ApiDemosTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/ApiDemosTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api25;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/AppTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/AppTest.java
index 36f90f5e..76c93c77 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/AppTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/AppTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api25;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/CameraTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/CameraTest.java
index ec888053..f3e6a2b6 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/CameraTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/CameraTest.java
@@ -17,7 +17,7 @@
 package com.android.devtools.systemimage.uitest.smoke.api25;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
+import androidx.test.runner.AndroidJUnit4;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.framework.SystemImageTestFramework;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/GoogleServicesTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/GoogleServicesTest.java
index 6d649a25..9aba8018 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/GoogleServicesTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/GoogleServicesTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api25;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/MapsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/MapsTest.java
index 1a31f96e..9cf654b0 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/MapsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/MapsTest.java
@@ -16,11 +16,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api25;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 import android.widget.EditText;
 import android.widget.ScrollView;
 import android.widget.TextView;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/NetworkIOTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/NetworkIOTest.java
index f988d1fb..84347936 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/NetworkIOTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/NetworkIOTest.java
@@ -18,14 +18,14 @@ package com.android.devtools.systemimage.uitest.smoke.api25;
 
 import android.app.Instrumentation;
 import android.content.Context;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.By;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiObjectNotFoundException;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
-import.androidx.test.uiautomator.Until;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
+import androidx.test.uiautomator.Until;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/PlayStoreTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/PlayStoreTest.java
index 36437531..0eefa719 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/PlayStoreTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/PlayStoreTest.java
@@ -17,9 +17,9 @@
 package com.android.devtools.systemimage.uitest.smoke.api25;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/SettingsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/SettingsTest.java
index fb35f4b4..b231da00 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/SettingsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/SettingsTest.java
@@ -17,13 +17,13 @@
 package com.android.devtools.systemimage.uitest.smoke.api25;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiObject2;
-import.androidx.test.uiautomator.UiObjectNotFoundException;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObject2;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 import android.widget.LinearLayout;
 import android.widget.TextView;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/ShellUtilTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/ShellUtilTest.java
index 426ff9be..af72f108 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/ShellUtilTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/ShellUtilTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api25;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/VpnTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/VpnTest.java
index 49cb500a..9f064df8 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/VpnTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/VpnTest.java
@@ -17,9 +17,9 @@
 package com.android.devtools.systemimage.uitest.smoke.api25;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/YouTubeTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/YouTubeTest.java
index 21e3dc2b..ea38f223 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/YouTubeTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api25/YouTubeTest.java
@@ -1,10 +1,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api25;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/AddGoogleAccountTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/AddGoogleAccountTest.java
index 0f3ee28e..d0241da5 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/AddGoogleAccountTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/AddGoogleAccountTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api26;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.framework.SystemImageTestFramework;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/ApiDemosTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/ApiDemosTest.java
index 81ee3cca..39a19ead 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/ApiDemosTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/ApiDemosTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api26;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/AppTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/AppTest.java
index b8032716..ba5a1fd3 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/AppTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/AppTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api26;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/CameraTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/CameraTest.java
index fa754e48..c403d67a 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/CameraTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/CameraTest.java
@@ -17,7 +17,7 @@
 package com.android.devtools.systemimage.uitest.smoke.api26;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
+import androidx.test.runner.AndroidJUnit4;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.framework.SystemImageTestFramework;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/GoogleServicesTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/GoogleServicesTest.java
index f7749e5b..ea6feb79 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/GoogleServicesTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/GoogleServicesTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api26;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/MapsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/MapsTest.java
index 49dc7dfa..ad26d902 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/MapsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/MapsTest.java
@@ -16,11 +16,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api26;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 import android.widget.EditText;
 import android.widget.ScrollView;
 import android.widget.TextView;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/NetworkIOTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/NetworkIOTest.java
index b852b9f0..45e432d2 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/NetworkIOTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/NetworkIOTest.java
@@ -17,14 +17,14 @@
 package com.android.devtools.systemimage.uitest.smoke.api26;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.By;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiObjectNotFoundException;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
-import.androidx.test.uiautomator.Until;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
+import androidx.test.uiautomator.Until;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/PlayStoreTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/PlayStoreTest.java
index a098fd54..85d26891 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/PlayStoreTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/PlayStoreTest.java
@@ -17,9 +17,9 @@
 package com.android.devtools.systemimage.uitest.smoke.api26;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/SettingsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/SettingsTest.java
index 9ab877c5..06c6fea4 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/SettingsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/SettingsTest.java
@@ -17,13 +17,13 @@
 package com.android.devtools.systemimage.uitest.smoke.api26;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiObject2;
-import.androidx.test.uiautomator.UiObjectNotFoundException;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObject2;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 import android.widget.LinearLayout;
 import android.widget.TextView;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/ShellUtilTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/ShellUtilTest.java
index b7d1b453..16e1a8d8 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/ShellUtilTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/ShellUtilTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api26;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/VpnTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/VpnTest.java
index 31c596f8..8ff1cee8 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/VpnTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/VpnTest.java
@@ -17,9 +17,9 @@
 package com.android.devtools.systemimage.uitest.smoke.api26;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/YouTubeTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/YouTubeTest.java
index f1daeedb..db465160 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/YouTubeTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api26/YouTubeTest.java
@@ -1,10 +1,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api26;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/AddGoogleAccountTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/AddGoogleAccountTest.java
index b4bc4566..bbd9feef 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/AddGoogleAccountTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/AddGoogleAccountTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api27;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiObjectNotFoundException;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.framework.SystemImageTestFramework;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/ApiDemosTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/ApiDemosTest.java
index f9115965..7da6c61d 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/ApiDemosTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/ApiDemosTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api27;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/AppTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/AppTest.java
index 6f5af278..258e7d3e 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/AppTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/AppTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api27;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/CameraTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/CameraTest.java
index bd3eccce..b97bb033 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/CameraTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/CameraTest.java
@@ -17,9 +17,9 @@
 package com.android.devtools.systemimage.uitest.smoke.api27;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/GoogleServicesTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/GoogleServicesTest.java
index 9057ed14..726cac7a 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/GoogleServicesTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/GoogleServicesTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api27;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/MapsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/MapsTest.java
index d53b9bdf..cc0dc941 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/MapsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/MapsTest.java
@@ -16,11 +16,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api27;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 import android.widget.EditText;
 import android.widget.ScrollView;
 import android.widget.TextView;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/NetworkIOTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/NetworkIOTest.java
index d87f82af..6adf400f 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/NetworkIOTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/NetworkIOTest.java
@@ -17,13 +17,13 @@
 package com.android.devtools.systemimage.uitest.smoke.api27;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.By;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
-import.androidx.test.uiautomator.Until;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
+import androidx.test.uiautomator.Until;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/PlayStoreTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/PlayStoreTest.java
index 7919665d..e8106bee 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/PlayStoreTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/PlayStoreTest.java
@@ -17,9 +17,9 @@
 package com.android.devtools.systemimage.uitest.smoke.api27;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiSelector;
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
 import com.android.devtools.systemimage.uitest.framework.SystemImageTestFramework;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/SettingsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/SettingsTest.java
index e5235042..7a072624 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/SettingsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/SettingsTest.java
@@ -17,12 +17,12 @@
 package com.android.devtools.systemimage.uitest.smoke.api27;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiObject2;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObject2;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 import android.widget.LinearLayout;
 import android.widget.TextView;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/ShellUtilTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/ShellUtilTest.java
index b3aa42fd..05648a39 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/ShellUtilTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/ShellUtilTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api27;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/VpnTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/VpnTest.java
index 7321a59c..1dd93be2 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/VpnTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/VpnTest.java
@@ -17,9 +17,9 @@
 package com.android.devtools.systemimage.uitest.smoke.api27;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/YouTubeTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/YouTubeTest.java
index ad6082b3..9db5bbfc 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/YouTubeTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api27/YouTubeTest.java
@@ -1,10 +1,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api27;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/AddGoogleAccountTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/AddGoogleAccountTest.java
index 42aa73e4..2454382e 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/AddGoogleAccountTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/AddGoogleAccountTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api28;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiObjectNotFoundException;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.framework.SystemImageTestFramework;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/ApiDemosTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/ApiDemosTest.java
index c4159db1..80bbabaa 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/ApiDemosTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/ApiDemosTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api28;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/AppTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/AppTest.java
index b2cfeedb..f3057458 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/AppTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/AppTest.java
@@ -17,13 +17,13 @@
 package com.android.devtools.systemimage.uitest.smoke.api28;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.By;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiObjectNotFoundException;
-import.androidx.test.uiautomator.UiSelector;
-import.androidx.test.uiautomator.Until;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiSelector;
+import androidx.test.uiautomator.Until;
 import android.util.Log;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/CameraTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/CameraTest.java
index 0e646b47..e1835374 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/CameraTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/CameraTest.java
@@ -17,9 +17,9 @@
 package com.android.devtools.systemimage.uitest.smoke.api28;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/GoogleServicesTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/GoogleServicesTest.java
index cf7f5a58..44e944a6 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/GoogleServicesTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/GoogleServicesTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api28;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/MapsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/MapsTest.java
index 239c40e8..3882cf0c 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/MapsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/MapsTest.java
@@ -16,10 +16,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api28;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.view.KeyEvent;
 import android.widget.EditText;
 import android.widget.TextView;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/NetworkIOTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/NetworkIOTest.java
index aaf98a7a..2d391b88 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/NetworkIOTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/NetworkIOTest.java
@@ -17,13 +17,13 @@
 package com.android.devtools.systemimage.uitest.smoke.api28;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.By;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
-import.androidx.test.uiautomator.Until;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
+import androidx.test.uiautomator.Until;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/PlayStoreTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/PlayStoreTest.java
index d032f6db..ad07a606 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/PlayStoreTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/PlayStoreTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api28;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/SettingsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/SettingsTest.java
index acf72bc4..af5966f2 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/SettingsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/SettingsTest.java
@@ -17,12 +17,12 @@
 package com.android.devtools.systemimage.uitest.smoke.api28;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiObject2;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObject2;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 import android.widget.TextView;
 
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/ShellUtilTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/ShellUtilTest.java
index b111ad8c..949d391b 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/ShellUtilTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/ShellUtilTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api28;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/VpnTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/VpnTest.java
index 038c50f2..2de2d324 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/VpnTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/VpnTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api28;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/YouTubeTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/YouTubeTest.java
index d84c1db4..ea6acc31 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/YouTubeTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api28/YouTubeTest.java
@@ -1,10 +1,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api28;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/AddGoogleAccountTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/AddGoogleAccountTest.java
index 09d13f1f..c0732899 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/AddGoogleAccountTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/AddGoogleAccountTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api29;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiObjectNotFoundException;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.framework.SystemImageTestFramework;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/ApiDemosTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/ApiDemosTest.java
index bd7efca1..38a5f02f 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/ApiDemosTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/ApiDemosTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api29;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/AppTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/AppTest.java
index dcae8cd0..c9b73e28 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/AppTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/AppTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api29;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiObjectNotFoundException;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/CameraTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/CameraTest.java
index 6776aec7..5474f919 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/CameraTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/CameraTest.java
@@ -17,9 +17,9 @@
 package com.android.devtools.systemimage.uitest.smoke.api29;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/GoogleServicesTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/GoogleServicesTest.java
index c33dbcba..4bac8724 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/GoogleServicesTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/GoogleServicesTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api29;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/MapsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/MapsTest.java
index 5a667b39..0dc1f0d2 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/MapsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/MapsTest.java
@@ -16,10 +16,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api29;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.view.KeyEvent;
 import android.widget.EditText;
 import android.widget.TextView;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/NetworkIOTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/NetworkIOTest.java
index 7a44309e..3ef04025 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/NetworkIOTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/NetworkIOTest.java
@@ -17,13 +17,13 @@
 package com.android.devtools.systemimage.uitest.smoke.api29;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.By;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
-import.androidx.test.uiautomator.Until;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
+import androidx.test.uiautomator.Until;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/PlayStoreTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/PlayStoreTest.java
index 4468df3c..99a7cb7b 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/PlayStoreTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/PlayStoreTest.java
@@ -16,10 +16,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api29;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/SettingsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/SettingsTest.java
index 7e07e005..77ff3bec 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/SettingsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/SettingsTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api29;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 import android.widget.TextView;
 
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/ShellUtilTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/ShellUtilTest.java
index d5c21ace..af68488c 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/ShellUtilTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/ShellUtilTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api29;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/VpnTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/VpnTest.java
index 2ddae8ab..b41c38a3 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/VpnTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/VpnTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api29;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/YouTubeTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/YouTubeTest.java
index 77ab21c8..5563c141 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/YouTubeTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api29/YouTubeTest.java
@@ -1,10 +1,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api29;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/AddGoogleAccountTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/AddGoogleAccountTest.java
index cbd96026..11336697 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/AddGoogleAccountTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/AddGoogleAccountTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api30;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiObjectNotFoundException;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.framework.SystemImageTestFramework;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/ApiDemosTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/ApiDemosTest.java
index 06491e1d..0a8a3914 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/ApiDemosTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/ApiDemosTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api30;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/AppTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/AppTest.java
index a64ff31a..c29b9779 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/AppTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/AppTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api30;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/CameraTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/CameraTest.java
index aa00171c..1c83101b 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/CameraTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/CameraTest.java
@@ -17,9 +17,9 @@
 package com.android.devtools.systemimage.uitest.smoke.api30;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/GoogleServicesTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/GoogleServicesTest.java
index b6b734ca..033dab94 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/GoogleServicesTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/GoogleServicesTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api30;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/MapsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/MapsTest.java
index 8b25ef8e..975c2d4c 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/MapsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/MapsTest.java
@@ -16,10 +16,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api30;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.view.KeyEvent;
 import android.widget.EditText;
 import android.widget.TextView;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/NetworkIOTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/NetworkIOTest.java
index d8448837..27cefe8c 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/NetworkIOTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/NetworkIOTest.java
@@ -17,13 +17,13 @@
 package com.android.devtools.systemimage.uitest.smoke.api30;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.By;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
-import.androidx.test.uiautomator.Until;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
+import androidx.test.uiautomator.Until;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/PlayStoreTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/PlayStoreTest.java
index 019bd074..323ca4c9 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/PlayStoreTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/PlayStoreTest.java
@@ -16,10 +16,10 @@
 
 package com.android.devtools.systemimage.uitest.smoke.api30;
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
 import com.android.devtools.systemimage.uitest.framework.SystemImageTestFramework;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/SettingsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/SettingsTest.java
index ff0bd69a..4a0c6b80 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/SettingsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/SettingsTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api30;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 import android.widget.TextView;
 
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/ShellUtilTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/ShellUtilTest.java
index 6a219f69..34db4c9a 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/ShellUtilTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/ShellUtilTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api30;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/VpnTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/VpnTest.java
index 49adf30b..d9a05460 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/VpnTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/VpnTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api30;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/VpnTestUtil.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/VpnTestUtil.java
index 0bdeda72..018a23d5 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/VpnTestUtil.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/VpnTestUtil.java
@@ -18,8 +18,8 @@ package com.android.devtools.systemimage.uitest.utils;
 
 import com.android.devtools.systemimage.uitest.common.Res;
 
-import.androidx.test.uiautomator.By;
-import.androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.UiDevice;
 import android.util.Log;
 
 import java.util.concurrent.TimeUnit;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/YouTubeTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/YouTubeTest.java
index 0ffb182b..56d32d2c 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/YouTubeTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api30/YouTubeTest.java
@@ -1,11 +1,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api30;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiObjectNotFoundException;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/AddGoogleAccountTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/AddGoogleAccountTest.java
index 019d8374..368e7532 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/AddGoogleAccountTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/AddGoogleAccountTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api31;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/ApiDemosTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/ApiDemosTest.java
index ede590d9..069667ec 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/ApiDemosTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/ApiDemosTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api31;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/AppTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/AppTest.java
index f7f52271..09a25634 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/AppTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/AppTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api31;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/CameraTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/CameraTest.java
index cabddec7..52ac5cf4 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/CameraTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/CameraTest.java
@@ -16,9 +16,9 @@
 package com.android.devtools.systemimage.uitest.smoke.api31;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/GoogleServicesTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/GoogleServicesTest.java
index 632e3e27..7020633d 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/GoogleServicesTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/GoogleServicesTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api31;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/MapsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/MapsTest.java
index b54aa3ef..213a9657 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/MapsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/MapsTest.java
@@ -16,10 +16,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api31;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.view.KeyEvent;
 import android.widget.EditText;
 import android.widget.TextView;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/NetworkIOTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/NetworkIOTest.java
index 548021a8..e8fc2669 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/NetworkIOTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/NetworkIOTest.java
@@ -17,14 +17,14 @@
 package com.android.devtools.systemimage.uitest.smoke.api31;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.By;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiObjectNotFoundException;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
-import.androidx.test.uiautomator.Until;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
+import androidx.test.uiautomator.Until;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/PlayStoreTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/PlayStoreTest.java
index 8ca17262..f5a47d45 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/PlayStoreTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/PlayStoreTest.java
@@ -16,10 +16,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api31;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/SettingsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/SettingsTest.java
index 32f5cea3..e5920c4a 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/SettingsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/SettingsTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api31;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 import android.widget.Button;
 import android.widget.EditText;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/ShellUtilTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/ShellUtilTest.java
index d38df7b4..b38ae69b 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/ShellUtilTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/ShellUtilTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api31;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/VpnTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/VpnTest.java
index b3abab65..606d370a 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/VpnTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/VpnTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api31;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/YouTubeTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/YouTubeTest.java
index a32c22f9..877e4e5c 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/YouTubeTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/YouTubeTest.java
@@ -16,10 +16,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api31;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/AddGoogleAccountTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/AddGoogleAccountTest.java
index 3aeb92f8..4c9a9610 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/AddGoogleAccountTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/AddGoogleAccountTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api32;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/ApiDemosTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/ApiDemosTest.java
index 9f5a3937..fcd4cfdf 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/ApiDemosTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/ApiDemosTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api32;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/AppTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/AppTest.java
index d5e48c2e..906e6f61 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/AppTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/AppTest.java
@@ -19,10 +19,10 @@ package com.android.devtools.systemimage.uitest.smoke.api32;
 import static org.junit.Assert.assertTrue;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/CameraTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/CameraTest.java
index 256a811f..6952417f 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/CameraTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/CameraTest.java
@@ -18,9 +18,9 @@ package com.android.devtools.systemimage.uitest.smoke.api32;
 import static org.junit.Assert.assertTrue;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/GoogleServicesTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/GoogleServicesTest.java
index 9e9c8345..903b94fd 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/GoogleServicesTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/GoogleServicesTest.java
@@ -19,11 +19,11 @@ package com.android.devtools.systemimage.uitest.smoke.api32;
 import static org.junit.Assert.assertTrue;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/MapsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/MapsTest.java
index 187af794..c3cf92eb 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/MapsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/MapsTest.java
@@ -18,10 +18,10 @@ package com.android.devtools.systemimage.uitest.smoke.api32;
 import static org.junit.Assert.assertTrue;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.view.KeyEvent;
 import android.widget.EditText;
 import android.widget.TextView;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/NetworkIOTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/NetworkIOTest.java
index 0ef48b17..0415f4cc 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/NetworkIOTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/NetworkIOTest.java
@@ -17,12 +17,12 @@
 package com.android.devtools.systemimage.uitest.smoke.api32;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiObjectNotFoundException;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/PlayStoreTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/PlayStoreTest.java
index 81b817db..4d202ff8 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/PlayStoreTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/PlayStoreTest.java
@@ -16,10 +16,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api32;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/SettingsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/SettingsTest.java
index 0a101e51..acc0b594 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/SettingsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/SettingsTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api32;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 import android.widget.Button;
 import android.widget.EditText;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/ShellUtilTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/ShellUtilTest.java
index c46bdb22..6598acf6 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/ShellUtilTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/ShellUtilTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api32;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/VpnTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/VpnTest.java
index 6d4b947b..90f55e9e 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/VpnTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/VpnTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api32;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/YouTubeTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/YouTubeTest.java
index 5bf5e6bf..af964252 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/YouTubeTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api32/YouTubeTest.java
@@ -16,10 +16,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api32;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/AddGoogleAccountTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/AddGoogleAccountTest.java
index 34011a31..1614e00f 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/AddGoogleAccountTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/AddGoogleAccountTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api33;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/ApiDemosTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/ApiDemosTest.java
index ba950f60..4e67c9b7 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/ApiDemosTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/ApiDemosTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api33;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/AppTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/AppTest.java
index 26c47fb3..82c87d95 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/AppTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/AppTest.java
@@ -19,10 +19,10 @@ package com.android.devtools.systemimage.uitest.smoke.api33;
 import static org.junit.Assert.assertTrue;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/CameraTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/CameraTest.java
index 4be55b37..37dc5a2a 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/CameraTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/CameraTest.java
@@ -18,9 +18,9 @@ package com.android.devtools.systemimage.uitest.smoke.api33;
 import static org.junit.Assert.assertTrue;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/GoogleServicesTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/GoogleServicesTest.java
index 9fee45bc..a8b7d8c5 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/GoogleServicesTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/GoogleServicesTest.java
@@ -19,11 +19,11 @@ package com.android.devtools.systemimage.uitest.smoke.api33;
 import static org.junit.Assert.assertTrue;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/MapsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/MapsTest.java
index 32d11096..a2182d1c 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/MapsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/MapsTest.java
@@ -18,10 +18,10 @@ package com.android.devtools.systemimage.uitest.smoke.api33;
 import static org.junit.Assert.assertTrue;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.view.KeyEvent;
 import android.widget.EditText;
 import android.widget.TextView;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/NetworkIOTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/NetworkIOTest.java
index a982a05c..20eda2c5 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/NetworkIOTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/NetworkIOTest.java
@@ -17,12 +17,12 @@
 package com.android.devtools.systemimage.uitest.smoke.api33;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiObjectNotFoundException;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/PlayStoreTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/PlayStoreTest.java
index 8fdae704..62edecea 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/PlayStoreTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/PlayStoreTest.java
@@ -16,10 +16,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api33;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/SettingsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/SettingsTest.java
index 7efbc67f..a6248731 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/SettingsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/SettingsTest.java
@@ -17,11 +17,11 @@
 package com.android.devtools.systemimage.uitest.smoke.api33;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiScrollable;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 import android.widget.Button;
 import android.widget.EditText;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/ShellUtilTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/ShellUtilTest.java
index 07a5ca6d..67ab3fa6 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/ShellUtilTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/ShellUtilTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api33;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 import android.util.Log;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/VpnTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/VpnTest.java
index 7f632c09..e99c68bd 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/VpnTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/VpnTest.java
@@ -17,10 +17,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api33;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/YouTubeTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/YouTubeTest.java
index d21f651d..4aebb585 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/YouTubeTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api33/YouTubeTest.java
@@ -16,10 +16,10 @@
 package com.android.devtools.systemimage.uitest.smoke.api33;
 
 import android.app.Instrumentation;
-import.androidx.test.runner.AndroidJUnit4;
-import.androidx.test.uiautomator.UiDevice;
-import.androidx.test.uiautomator.UiObject;
-import.androidx.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/tv/api26/SettingsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/tv/api26/SettingsTest.java
index a85b946d..41799525 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/tv/api26/SettingsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/tv/api26/SettingsTest.java
@@ -17,12 +17,12 @@
 package com.android.devtools.systemimage.uitest.tv.api26;
 
 import android.app.Instrumentation;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject;
-import android.support.test.uiautomator.UiObjectNotFoundException;
-import android.support.test.uiautomator.UiScrollable;
-import android.support.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/tv/api27/SettingsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/tv/api27/SettingsTest.java
index 834c7211..f9a613ba 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/tv/api27/SettingsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/tv/api27/SettingsTest.java
@@ -17,12 +17,12 @@
 package com.android.devtools.systemimage.uitest.tv.api27;
 
 import android.app.Instrumentation;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject;
-import android.support.test.uiautomator.UiObjectNotFoundException;
-import android.support.test.uiautomator.UiScrollable;
-import android.support.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/tv/api28/SettingsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/tv/api28/SettingsTest.java
index c9cb899a..f4be1c91 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/tv/api28/SettingsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/tv/api28/SettingsTest.java
@@ -17,12 +17,12 @@
 package com.android.devtools.systemimage.uitest.tv.api28;
 
 import android.app.Instrumentation;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject;
-import android.support.test.uiautomator.UiObjectNotFoundException;
-import android.support.test.uiautomator.UiScrollable;
-import android.support.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/unittest/utils/AccountManagerTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/unittest/utils/AccountManagerTest.java
index 19cec50e..0002b8b6 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/unittest/utils/AccountManagerTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/unittest/utils/AccountManagerTest.java
@@ -26,7 +26,7 @@ import org.junit.rules.Timeout;
 import org.junit.runner.RunWith;
 
 import android.app.Instrumentation;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.runner.AndroidJUnit4;
 
 /**
  * Unit test on {@link AccountManager}.
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/wear/api26/DisplayTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/wear/api26/DisplayTest.java
index baffc7d9..29b5043a 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/wear/api26/DisplayTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/wear/api26/DisplayTest.java
@@ -17,12 +17,12 @@
 package com.android.devtools.systemimage.uitest.wear.api26;
 
 import android.app.Instrumentation;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject;
-import android.support.test.uiautomator.UiObjectNotFoundException;
-import android.support.test.uiautomator.UiScrollable;
-import android.support.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
@@ -466,4 +466,4 @@ public class DisplayTest {
             }
         }
     }
-}
-\ No newline at end of file
+}
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/wear/api27/DisplayTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/wear/api27/DisplayTest.java
index 27f06db3..d40dd7ae 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/wear/api27/DisplayTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/wear/api27/DisplayTest.java
@@ -17,12 +17,12 @@
 package com.android.devtools.systemimage.uitest.wear.api27;
 
 import android.app.Instrumentation;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject;
-import android.support.test.uiautomator.UiObjectNotFoundException;
-import android.support.test.uiautomator.UiScrollable;
-import android.support.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/wear/api28/DisplayTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/wear/api28/DisplayTest.java
index 51184623..4010bbaa 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/wear/api28/DisplayTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/wear/api28/DisplayTest.java
@@ -17,12 +17,12 @@
 package com.android.devtools.systemimage.uitest.wear.api28;
 
 import android.app.Instrumentation;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject;
-import android.support.test.uiautomator.UiObjectNotFoundException;
-import android.support.test.uiautomator.UiScrollable;
-import android.support.test.uiautomator.UiSelector;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
 
 import com.android.devtools.systemimage.uitest.annotations.TestInfo;
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/main/AndroidManifest.xml b/system_image_uitests/app/src/main/AndroidManifest.xml
index bbc055af..db985156 100644
--- a/system_image_uitests/app/src/main/AndroidManifest.xml
+++ b/system_image_uitests/app/src/main/AndroidManifest.xml
@@ -29,7 +29,7 @@
           android:theme="@style/AppTheme"
           android:requestLegacyExternalStorage="true">
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
             android:exported="false"
             android:grantUriPermissions="true">
diff --git a/system_image_uitests/app/src/main/java/com/android/devtools/systemimage/uitest/framework/IgnoreAnnotationListener.java b/system_image_uitests/app/src/main/java/com/android/devtools/systemimage/uitest/framework/IgnoreAnnotationListener.java
index 6a6a3490..1b984922 100644
--- a/system_image_uitests/app/src/main/java/com/android/devtools/systemimage/uitest/framework/IgnoreAnnotationListener.java
+++ b/system_image_uitests/app/src/main/java/com/android/devtools/systemimage/uitest/framework/IgnoreAnnotationListener.java
@@ -96,8 +96,9 @@ public class IgnoreAnnotationListener extends RunListener {
 
         checkStoragePermissions();
         String classSimpleName = ignoredTests.get(0).get("classSimpleName");
-        String externalStorageDir = Environment.getExternalStorageDirectory().getPath();
-        File logDir = new File(externalStorageDir, "Logs");
+        File externalStorageDocumentsDir =
+                new File(Environment.getExternalStorageDirectory().getPath(), "Documents");
+        File logDir = new File(externalStorageDocumentsDir, "Logs");
         if (!logDir.exists())
             logDir.mkdir();
         File classLogDir = new File(logDir.getPath(), classSimpleName);
diff --git a/system_image_uitests/app/src/main/java/com/android/devtools/systemimage/uitest/framework/SystemImageTestFramework.java b/system_image_uitests/app/src/main/java/com/android/devtools/systemimage/uitest/framework/SystemImageTestFramework.java
index 4f12c9d3..e657e5e6 100644
--- a/system_image_uitests/app/src/main/java/com/android/devtools/systemimage/uitest/framework/SystemImageTestFramework.java
+++ b/system_image_uitests/app/src/main/java/com/android/devtools/systemimage/uitest/framework/SystemImageTestFramework.java
@@ -97,11 +97,12 @@ public class SystemImageTestFramework implements TestRule {
     private File getLoggingDir(String testClassName, String testMethodName) {
         Assert.assertTrue("Failed to write to external storage.", isExternalStorageWritable());
         Assert.assertTrue("Failed to acquire permission.", checkWriteExternalPermission());
-        File externalStorageLogDir =
-                new File(Environment.getExternalStorageDirectory().getPath(), "Logs");
-        if (!externalStorageLogDir.exists())
-            externalStorageLogDir.mkdir();
-        File loggingDir = new File(new File(externalStorageLogDir.getPath(), testClassName),
+        File externalStorageDocumentsDir =
+                new File(Environment.getExternalStorageDirectory().getPath(), "Documents");
+        File externalStorageLogsDir = new File(externalStorageDocumentsDir, "Logs");
+        if (!externalStorageLogsDir.exists())
+            externalStorageLogsDir.mkdir();
+        File loggingDir = new File(new File(externalStorageLogsDir.getPath(), testClassName),
                 testMethodName);
         loggingDir.mkdirs();
         return loggingDir;
diff --git a/system_image_uitests/app/src/main/java/com/android/devtools/systemimage/uitest/utils/AccountManager.java b/system_image_uitests/app/src/main/java/com/android/devtools/systemimage/uitest/utils/AccountManager.java
index 2e24ad2a..a100d92d 100644
--- a/system_image_uitests/app/src/main/java/com/android/devtools/systemimage/uitest/utils/AccountManager.java
+++ b/system_image_uitests/app/src/main/java/com/android/devtools/systemimage/uitest/utils/AccountManager.java
@@ -16,7 +16,7 @@
 
 package com.android.devtools.systemimage.uitest.utils;
 
-import com.google.android.apps.common.testing.util.AndroidTestUtil;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import com.android.devtools.systemimage.uitest.common.Res;
 
@@ -25,6 +25,8 @@ import androidx.test.uiautomator.UiDevice;
 import androidx.test.uiautomator.UiObject;
 import androidx.test.uiautomator.UiObjectNotFoundException;
 import androidx.test.uiautomator.UiSelector;
+
+import android.os.Bundle;
 import android.util.Log;
 
 import java.io.BufferedReader;
@@ -58,10 +60,8 @@ public class AccountManager {
         // Note that the gaccountFilePath is under Android filesystem.
         // Use 'adb push' to upload a credential file before testing.
         if (username == null || password == null) {
-            String gaccountFilePath =
-                    AndroidTestUtil.getTestArg(
-                            instrumentation.getContext().getContentResolver(),
-                            "gaccount");
+            Bundle argsBundle = InstrumentationRegistry.getArguments();
+            String gaccountFilePath = argsBundle.getString("gaccount");
             BufferedReader br = new BufferedReader(new FileReader(gaccountFilePath));
             username = br.readLine().trim();
             password = br.readLine().trim();
@@ -135,10 +135,8 @@ public class AccountManager {
     public static void removeAccount(Instrumentation instrumentation, String username)
             throws UiObjectNotFoundException, IOException {
         if (username == null) {
-            String gaccountFilePath =
-                    AndroidTestUtil.getTestArg(
-                            instrumentation.getContext().getContentResolver(),
-                            "gaccount");
+            Bundle argsBundle = InstrumentationRegistry.getArguments();
+            String gaccountFilePath = argsBundle.getString("gaccount");
             BufferedReader br = new BufferedReader(new FileReader(gaccountFilePath));
             username = br.readLine().trim();
             br.close();
diff --git a/system_image_uitests/app/src/main/java/com/android/devtools/systemimage/uitest/utils/PackageInstallationUtil.java b/system_image_uitests/app/src/main/java/com/android/devtools/systemimage/uitest/utils/PackageInstallationUtil.java
index 501ecbde..ae6b2a9d 100644
--- a/system_image_uitests/app/src/main/java/com/android/devtools/systemimage/uitest/utils/PackageInstallationUtil.java
+++ b/system_image_uitests/app/src/main/java/com/android/devtools/systemimage/uitest/utils/PackageInstallationUtil.java
@@ -26,7 +26,7 @@ import androidx.test.uiautomator.UiObject;
 import androidx.test.uiautomator.UiObjectNotFoundException;
 import androidx.test.uiautomator.UiScrollable;
 import androidx.test.uiautomator.UiSelector;
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
 import android.util.Log;
 
 import com.android.devtools.systemimage.uitest.common.Res;
diff --git a/system_image_uitests/app/src/main/java/com/android/devtools/systemimage/uitest/watchers/GoogleAccountLoginWatcher.java b/system_image_uitests/app/src/main/java/com/android/devtools/systemimage/uitest/watchers/GoogleAccountLoginWatcher.java
index 6c9385ab..05013836 100644
--- a/system_image_uitests/app/src/main/java/com/android/devtools/systemimage/uitest/watchers/GoogleAccountLoginWatcher.java
+++ b/system_image_uitests/app/src/main/java/com/android/devtools/systemimage/uitest/watchers/GoogleAccountLoginWatcher.java
@@ -20,9 +20,9 @@ import com.android.devtools.systemimage.uitest.utils.AccountManager;
 
 import org.junit.Assert;
 
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiSelector;
-import android.support.test.uiautomator.UiWatcher;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiSelector;
+import androidx.test.uiautomator.UiWatcher;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/system_image_uitests/build.gradle b/system_image_uitests/build.gradle
index ddb0cd43..63895aa3 100644
--- a/system_image_uitests/build.gradle
+++ b/system_image_uitests/build.gradle
@@ -7,6 +7,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:8.3.1'
+	classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
author	Android Build Coastguard Worker <android-build-coastguard-worker@google.com>	2024-05-02 16:43:57 +0000
committer	Android Build Coastguard Worker <android-build-coastguard-worker@google.com>	2024-05-02 16:43:57 +0000
commit	5aa6a42b7b18f32c84ab85bb03a9985ec5c7a3be (patch)
tree	df61a2d604ee2ef5c797ef9a66ec29a76fffe500
parent	0ba1409ac12274b67de8c40fd09e5247a5329153 (diff)
parent	11e07f07054a844e2cd9185829dba1059de720b5 (diff)
download	adt-infra-emu-35-1-release.tar.gz