diff --git a/service/res/values/strings.xml b/service/res/values/strings.xml
index 93021b5..acc7a58 100644
--- a/service/res/values/strings.xml
+++ b/service/res/values/strings.xml
@@ -256,7 +256,7 @@
     <string name="car_permission_label_enroll_trust">Enroll Trusted Device</string>
     <string name="car_permission_desc_enroll_trust">Allow Trusted Device Enrollment</string>
 
-    <!-- The default name of device enrolled as trust device [CHAR LIMIT=16] -->
+    <!-- The default name of device enrolled as trust device [CHAR LIMIT=NONE] -->
     <string name="trust_device_default_name">My Device</string>
 
     <!-- The package name of the media application that will be selected as the default [CHAR LIMIT=NONE] -->
diff --git a/tests/carservice_test/src/com/android/car/SystemActivityMonitoringServiceTest.java b/tests/carservice_test/src/com/android/car/SystemActivityMonitoringServiceTest.java
index 906192a..4899246 100644
--- a/tests/carservice_test/src/com/android/car/SystemActivityMonitoringServiceTest.java
+++ b/tests/carservice_test/src/com/android/car/SystemActivityMonitoringServiceTest.java
@@ -22,7 +22,6 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Bundle;
 
 import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.MediumTest;
@@ -142,8 +141,8 @@
     public static class ActivityThatFinishesImmediately extends Activity {
 
         @Override
-        protected void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
+        protected void onResume() {
+            super.onResume();
             finish();
         }
     }