diff --git a/espresso/device/CHANGELOG.md b/espresso/device/CHANGELOG.md
index 8b6ff3f37..ab0d9bcc5 100644
--- a/espresso/device/CHANGELOG.md
+++ b/espresso/device/CHANGELOG.md
@@ -8,7 +8,7 @@
 
 * Add support for setting screen orientation with multiple resumed activities
 * Fix concurrent modification issue when setting screen orientation and fold modes
-* Adjust reference docs to state set up guide is now located at https://developer.android.com/studio/test/espresso-api#set_up_your_project_for_the_espresso_device_api
+* Adjust reference docs to state set up guide is now located at https://developer.android.com/studio/test/espresso-api
 
 **New Features**
 
diff --git a/espresso/device/java/androidx/test/espresso/device/controller/emulator/EmulatorController.kt b/espresso/device/java/androidx/test/espresso/device/controller/emulator/EmulatorController.kt
index 9a735d742..9f1d4ce1c 100644
--- a/espresso/device/java/androidx/test/espresso/device/controller/emulator/EmulatorController.kt
+++ b/espresso/device/java/androidx/test/espresso/device/controller/emulator/EmulatorController.kt
@@ -53,7 +53,7 @@ constructor(
     private const val DEGREES_TO_ROTATE_LANDSCAPE_TO_PORTRAIT = -90F
     private const val DEGREES_TO_ROTATE_PORTRAIT_TO_LANDSCAPE = 90F
     private const val additionalSetUpInstructions =
-      " See https://developer.android.com/studio/test/espresso-api#set_up_your_project_for_the_espresso_device_api for setup instructions."
+      " See https://developer.android.com/studio/test/espresso-api for setup instructions."
   }
 
   override fun setDeviceMode(deviceMode: Int) {
diff --git a/espresso/device/java/androidx/test/espresso/device/dagger/DeviceControllerModule.kt b/espresso/device/java/androidx/test/espresso/device/dagger/DeviceControllerModule.kt
index c0823c713..a2cc7541d 100644
--- a/espresso/device/java/androidx/test/espresso/device/dagger/DeviceControllerModule.kt
+++ b/espresso/device/java/androidx/test/espresso/device/dagger/DeviceControllerModule.kt
@@ -81,7 +81,7 @@ internal class DeviceControllerModule {
       args.getString(EmulatorGrpcConn.ARGS_GRPC_TOKEN, ""),
       args.getString(EmulatorGrpcConn.ARGS_GRPC_CER, ""),
       args.getString(EmulatorGrpcConn.ARGS_GRPC_KEY, ""),
-      args.getString(EmulatorGrpcConn.ARGS_GRPC_CA, "")
+      args.getString(EmulatorGrpcConn.ARGS_GRPC_CA, ""),
     )
   }
 
@@ -95,7 +95,7 @@ internal class DeviceControllerModule {
       if (getDeviceApiLevel() >= 17) {
         Settings.Global.getString(
           InstrumentationRegistry.getInstrumentation().getTargetContext().getContentResolver(),
-          "mdevx.grpc_guest_port"
+          "mdevx.grpc_guest_port",
         )
       } else {
         val clazz = Class.forName("android.os.SystemProperties")
@@ -106,7 +106,7 @@ internal class DeviceControllerModule {
       throw DeviceControllerOperationException(
         "Unable to connect to Emulator gRPC port. Please make sure the Android Emulator version" +
           " is updated to 33.1.11+ and the controller gRPC service is enabled on the emulator." +
-          " See https://developer.android.com/studio/test/espresso-api#set_up_your_project_for_the_espresso_device_api for setup instructions."
+          " See https://developer.android.com/studio/test/espresso-api for setup instructions."
       )
     }
     return gRpcPort.toInt()