Merge "Integrate the latest changes" into main
diff --git a/libraries/audio-test-harness/client-lib/Android.bp b/libraries/audio-test-harness/client-lib/Android.bp
index 8fa1494..e0d71bb 100644
--- a/libraries/audio-test-harness/client-lib/Android.bp
+++ b/libraries/audio-test-harness/client-lib/Android.bp
@@ -20,6 +20,7 @@
 // LIBRARIES ==============================================================
 
 package {
+    default_team: "trendy_team_android_video_image_codecs",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/audio-test-harness/instrumentation/Android.bp b/libraries/audio-test-harness/instrumentation/Android.bp
index 54be1d8..746d333 100644
--- a/libraries/audio-test-harness/instrumentation/Android.bp
+++ b/libraries/audio-test-harness/instrumentation/Android.bp
@@ -15,6 +15,7 @@
  */
 
 package {
+    default_team: "trendy_team_android_video_image_codecs",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/audio-test-harness/server/Android.bp b/libraries/audio-test-harness/server/Android.bp
index 1414165..55a9b95 100644
--- a/libraries/audio-test-harness/server/Android.bp
+++ b/libraries/audio-test-harness/server/Android.bp
@@ -20,6 +20,7 @@
 // BINARIES ==============================================================
 
 package {
+    default_team: "trendy_team_android_video_image_codecs",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/audio-test-harness/tradefed/Android.bp b/libraries/audio-test-harness/tradefed/Android.bp
index a1b6fe7..9ec9aaf 100644
--- a/libraries/audio-test-harness/tradefed/Android.bp
+++ b/libraries/audio-test-harness/tradefed/Android.bp
@@ -22,6 +22,7 @@
 // java_library_host and manually copy the JAR with the Android.mk file.
 
 package {
+    default_team: "trendy_team_android_video_image_codecs",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/collectors-helper/tests/Android.bp b/libraries/collectors-helper/tests/Android.bp
index 1868b16..b97263a 100644
--- a/libraries/collectors-helper/tests/Android.bp
+++ b/libraries/collectors-helper/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_windowing_infra_",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/compatibility-common-util/tests/Android.bp b/libraries/compatibility-common-util/tests/Android.bp
index 5f58654..ad8769e 100644
--- a/libraries/compatibility-common-util/tests/Android.bp
+++ b/libraries/compatibility-common-util/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_android_testing_experiences",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/device-collectors/src/hostsidetests/Android.bp b/libraries/device-collectors/src/hostsidetests/Android.bp
index 03f9d43..ed0d110 100644
--- a/libraries/device-collectors/src/hostsidetests/Android.bp
+++ b/libraries/device-collectors/src/hostsidetests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_windowing_infra_",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/device-collectors/src/test/java/Android.bp b/libraries/device-collectors/src/test/java/Android.bp
index 7726d35..023ad1d 100644
--- a/libraries/device-collectors/src/test/java/Android.bp
+++ b/libraries/device-collectors/src/test/java/Android.bp
@@ -16,6 +16,7 @@
 
 // Android Unit Test target
 package {
+    default_team: "trendy_team_windowing_infra_",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/device-collectors/src/test/platform/Android.bp b/libraries/device-collectors/src/test/platform/Android.bp
index d4e3501..79dfbc7 100644
--- a/libraries/device-collectors/src/test/platform/Android.bp
+++ b/libraries/device-collectors/src/test/platform/Android.bp
@@ -16,6 +16,7 @@
 
 // Android Unit Test target
 package {
+    default_team: "trendy_team_windowing_infra_",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/flag-helpers/junit/test/Android.bp b/libraries/flag-helpers/junit/test/Android.bp
index 484ab30..11b3f8e 100644
--- a/libraries/flag-helpers/junit/test/Android.bp
+++ b/libraries/flag-helpers/junit/test/Android.bp
@@ -14,46 +14,47 @@
  * limitations under the License.
  */
 
- package {
-     default_applicable_licenses: ["Android-Apache-2.0"],
- }
+package {
+    default_team: "trendy_team_android_core_experiments",
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
 
- android_test {
-     name: "FlagJUnitTests",
-     plugins: ["auto_annotation_plugin"],
-     srcs: ["src/**/*.java"],
-     exclude_srcs: ["src/**/host/*.java"],
-     sdk_version: "test_current",
-     static_libs: [
-         "androidx.test.rules",
-         "auto_value_annotations",
-         "flag-junit",
-         "junit",
-         "platform-test-annotations",
-     ],
-     test_config: "FlagJUnitTests.xml",
-     test_suites: [
-         "general-tests",
-     ],
- }
+android_test {
+    name: "FlagJUnitTests",
+    plugins: ["auto_annotation_plugin"],
+    srcs: ["src/**/*.java"],
+    exclude_srcs: ["src/**/host/*.java"],
+    sdk_version: "test_current",
+    static_libs: [
+        "androidx.test.rules",
+        "auto_value_annotations",
+        "flag-junit",
+        "junit",
+        "platform-test-annotations",
+    ],
+    test_config: "FlagJUnitTests.xml",
+    test_suites: [
+        "general-tests",
+    ],
+}
 
- java_test_host {
-     name: "FlagJUnitHostTests",
-     srcs: ["src/**/*.java"],
-     exclude_srcs: ["src/**/DeviceFlagsValueProviderTest.java"],
-     plugins: ["auto_annotation_plugin"],
-     static_libs: [
-         "auto_value_annotations",
-         "flag-junit-host",
-         "junit",
-         "mockito-host",
-         "objenesis",
-         "platform-test-annotations",
-     ],
-     libs: [
-         "tradefed",
-     ],
-     test_options: {
-         unit_test: true,
-     },
- }
\ No newline at end of file
+java_test_host {
+    name: "FlagJUnitHostTests",
+    srcs: ["src/**/*.java"],
+    exclude_srcs: ["src/**/DeviceFlagsValueProviderTest.java"],
+    plugins: ["auto_annotation_plugin"],
+    static_libs: [
+        "auto_value_annotations",
+        "flag-junit-host",
+        "junit",
+        "mockito-host",
+        "objenesis",
+        "platform-test-annotations",
+    ],
+    libs: [
+        "tradefed",
+    ],
+    test_options: {
+        unit_test: true,
+    },
+}
diff --git a/libraries/flag-helpers/libflagtest/Android.bp b/libraries/flag-helpers/libflagtest/Android.bp
index 12c2860..13561c9 100644
--- a/libraries/flag-helpers/libflagtest/Android.bp
+++ b/libraries/flag-helpers/libflagtest/Android.bp
@@ -15,6 +15,7 @@
 //
 
 package {
+    default_team: "trendy_team_partner_eng",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/flicker/Android.bp b/libraries/flicker/Android.bp
index ad96bd8..90baff4 100644
--- a/libraries/flicker/Android.bp
+++ b/libraries/flicker/Android.bp
@@ -15,6 +15,7 @@
 //
 
 package {
+    default_team: "trendy_team_windowing_tools",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/flicker/test/Android.bp b/libraries/flicker/test/Android.bp
index 44535b0..4b9d61d 100644
--- a/libraries/flicker/test/Android.bp
+++ b/libraries/flicker/test/Android.bp
@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-
 package {
+    default_team: "trendy_team_windowing_tools",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -29,14 +29,14 @@
     test_suites: ["device-tests"],
     libs: ["android.test.runner"],
     optimize: {
-        enabled: false
+        enabled: false,
     },
     static_libs: [
         "flickerlib",
         "flickerlib-trace_processor_shell",
         "FlickerLibTest-Utils",
         "launcher-aosp-tapl",
-        "mockito-target-extended-minus-junit4"
+        "mockito-target-extended-minus-junit4",
     ],
     data: [
         "trace_config/*",
diff --git a/libraries/health/composers/host/tests/Android.bp b/libraries/health/composers/host/tests/Android.bp
index 9f5caff..22ffd33 100644
--- a/libraries/health/composers/host/tests/Android.bp
+++ b/libraries/health/composers/host/tests/Android.bp
@@ -13,12 +13,13 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 java_library_static {
     name: "test-composers-tests",
-    srcs: [ "src/**/*.java" ],
+    srcs: ["src/**/*.java"],
     sdk_version: "current",
     host_supported: true,
     libs: [
diff --git a/libraries/health/composers/platform/tests/Android.bp b/libraries/health/composers/platform/tests/Android.bp
index 956e031..fb1fce5 100644
--- a/libraries/health/composers/platform/tests/Android.bp
+++ b/libraries/health/composers/platform/tests/Android.bp
@@ -15,6 +15,7 @@
 //
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -30,5 +31,5 @@
         "guava",
         "mockito-target-minus-junit4",
     ],
-    srcs: [ "src/**/*.java" ],
+    srcs: ["src/**/*.java"],
 }
diff --git a/libraries/health/options/tests/Android.bp b/libraries/health/options/tests/Android.bp
index 8767fba..84911e1 100644
--- a/libraries/health/options/tests/Android.bp
+++ b/libraries/health/options/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -20,7 +21,7 @@
     name: "PlatformTestOptionsTests",
     sdk_version: "30",
     min_sdk_version: "24",
-    srcs: [ "src/**/*.java" ],
+    srcs: ["src/**/*.java"],
     static_libs: [
         "androidx.test.runner",
         "platform-test-options",
diff --git a/libraries/health/rules/tests/Android.bp b/libraries/health/rules/tests/Android.bp
index 4807e70..22d5568 100644
--- a/libraries/health/rules/tests/Android.bp
+++ b/libraries/health/rules/tests/Android.bp
@@ -15,6 +15,7 @@
 //
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -31,7 +32,7 @@
     ],
     srcs: [
         "src/**/*.java",
-        "src/**/*.kt"
+        "src/**/*.kt",
     ],
     test_suites: ["device-tests"],
 }
diff --git a/libraries/health/runners/longevity/host/tests/Android.bp b/libraries/health/runners/longevity/host/tests/Android.bp
index ae990ab..ac5a7ca 100644
--- a/libraries/health/runners/longevity/host/tests/Android.bp
+++ b/libraries/health/runners/longevity/host/tests/Android.bp
@@ -15,6 +15,7 @@
 //
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/health/runners/longevity/platform/samples/Android.bp b/libraries/health/runners/longevity/platform/samples/Android.bp
index 70c9925..bb27ba0 100644
--- a/libraries/health/runners/longevity/platform/samples/Android.bp
+++ b/libraries/health/runners/longevity/platform/samples/Android.bp
@@ -15,6 +15,7 @@
 //
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -41,7 +42,7 @@
         "&& if ! ($(location aprotoc) --encode=longevity.profile.Configuration " +
         "$(location :profile-proto-def) < $$file > " +
         "$$out_dir/$$assets_dir/$${fname//.textpb/.pb}) ; then " +
-        "echo \"\033[0;31mFailed to parse profile $$file. See above for errors.\033[0m\" " +
+        "echo \"\x1b[0;31mFailed to parse profile $$file. See above for errors.\x1b[0m\" " +
         "&& exit 1 ; fi ; done && jar cf $(out) -C $$(dirname $(out)) $$assets_dir",
 }
 
diff --git a/libraries/health/runners/longevity/platform/tests/Android.bp b/libraries/health/runners/longevity/platform/tests/Android.bp
index 4e22b28..87e680b 100644
--- a/libraries/health/runners/longevity/platform/tests/Android.bp
+++ b/libraries/health/runners/longevity/platform/tests/Android.bp
@@ -15,6 +15,7 @@
 //
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -41,7 +42,7 @@
         "&& if ! ($(location aprotoc) --encode=longevity.profile.Configuration " +
         "$(location :profile-proto-def) < $$file > " +
         "$$out_dir/$$assets_dir/$${fname//.textpb/.pb}) ; then " +
-        "echo \"\033[0;31mFailed to parse profile $$file. See above for errors.\033[0m\" " +
+        "echo \"\x1b[0;31mFailed to parse profile $$file. See above for errors.\x1b[0m\" " +
         "&& exit 1 ; fi ; done && jar cf $(out) -C $$(dirname $(out)) $$assets_dir",
 }
 
diff --git a/libraries/health/runners/microbenchmark/tests/Android.bp b/libraries/health/runners/microbenchmark/tests/Android.bp
index 05f368a..36e0dd7 100644
--- a/libraries/health/runners/microbenchmark/tests/Android.bp
+++ b/libraries/health/runners/microbenchmark/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/health/utils/tests/Android.bp b/libraries/health/utils/tests/Android.bp
index e5e2fec..c937cfe 100644
--- a/libraries/health/utils/tests/Android.bp
+++ b/libraries/health/utils/tests/Android.bp
@@ -15,6 +15,7 @@
 //
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/metrics-helper/tests/Android.bp b/libraries/metrics-helper/tests/Android.bp
index b9b7071..31f9394 100644
--- a/libraries/metrics-helper/tests/Android.bp
+++ b/libraries/metrics-helper/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/power-helper/sample/Android.bp b/libraries/power-helper/sample/Android.bp
index 56dfcc9..e73f626 100644
--- a/libraries/power-helper/sample/Android.bp
+++ b/libraries/power-helper/sample/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/screenshot/Android.bp b/libraries/screenshot/Android.bp
index a9b515d..440b54f 100644
--- a/libraries/screenshot/Android.bp
+++ b/libraries/screenshot/Android.bp
@@ -14,6 +14,7 @@
 //
 
 package {
+    default_team: "trendy_team_testing",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -22,7 +23,7 @@
     manifest: "src/androidTest/manifest/AndroidManifest.xml",
     platform_apis: true,
     optimize: {
-        enabled: false
+        enabled: false,
     },
     srcs: [
         "src/**/*.java",
@@ -49,9 +50,11 @@
     name: "platform-screenshot-diff-core",
     manifest: "AndroidManifest.xml",
     platform_apis: true,
-    lint: { test: true },
+    lint: {
+        test: true,
+    },
     optimize: {
-        enabled: false
+        enabled: false,
     },
     srcs: [
         "src/main/java/platform/test/screenshot/**/*.java",
@@ -75,6 +78,6 @@
         "**/*.proto",
     ],
     optimize: {
-        enabled: false
-    }
+        enabled: false,
+    },
 }
diff --git a/libraries/screenshot/deviceless/layoutlib/tests/Android.bp b/libraries/screenshot/deviceless/layoutlib/tests/Android.bp
index a772a65..d360f6d 100644
--- a/libraries/screenshot/deviceless/layoutlib/tests/Android.bp
+++ b/libraries/screenshot/deviceless/layoutlib/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_testing",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -42,4 +43,3 @@
 
     required: ["layoutlib"],
 }
-
diff --git a/robolab/roboStandaloneProj/tests/Android.bp b/robolab/roboStandaloneProj/tests/Android.bp
index cc57001..ac7f481 100644
--- a/robolab/roboStandaloneProj/tests/Android.bp
+++ b/robolab/roboStandaloneProj/tests/Android.bp
@@ -14,6 +14,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_testing",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -26,6 +27,10 @@
         "src/**/*.java",
     ],
 
+    exclude_srcs: [
+        "src/com/android/myroboapplication/WelcomeActivityStrictTest.java",
+    ],
+
     java_resource_dirs: ["config"],
 
     libs: [
@@ -37,3 +42,27 @@
 
     upstream: true,
 }
+
+android_robolectric_test {
+    enabled: true,
+
+    name: "MyRoboStrictTests",
+
+    srcs: [
+        "src/com/android/myroboapplication/WelcomeActivityStrictTest.java",
+    ],
+
+    java_resource_dirs: ["config"],
+
+    libs: [
+        "androidx.test.core",
+        "androidx.test.runner",
+        "androidx.test.ext.junit",
+    ],
+
+    instrumentation_for: "MyRoboApplication",
+
+    upstream: true,
+
+    strict_mode: true,
+}
diff --git a/robolab/roboStandaloneProj/tests/src/com/android/myroboapplication/WelcomeActivityStrictTest.java b/robolab/roboStandaloneProj/tests/src/com/android/myroboapplication/WelcomeActivityStrictTest.java
new file mode 100644
index 0000000..cc0e4f7
--- /dev/null
+++ b/robolab/roboStandaloneProj/tests/src/com/android/myroboapplication/WelcomeActivityStrictTest.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.myroboapplication;
+
+import static org.junit.Assert.assertEquals;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+// import org.robolectric.Robolectric;
+
+@RunWith(AndroidJUnit4.class)
+public class WelcomeActivityStrictTest {
+
+    @Before
+    public void setup() throws Exception {}
+
+    @Test
+    public void checkMath() throws Exception {
+        assertEquals(1 + 1, 2);
+    }
+}
diff --git a/robolab/roboStandaloneProj/tests/src/com/android/myroboapplication/WelcomeActivityTest.java b/robolab/roboStandaloneProj/tests/src/com/android/myroboapplication/WelcomeActivityTest.java
index 835194e..f0e1b2a 100644
--- a/robolab/roboStandaloneProj/tests/src/com/android/myroboapplication/WelcomeActivityTest.java
+++ b/robolab/roboStandaloneProj/tests/src/com/android/myroboapplication/WelcomeActivityTest.java
@@ -1,9 +1,25 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.android.myroboapplication;
 
 import static org.junit.Assert.assertEquals;
-import static com.android.myroboapplication.R.*;
 
 import android.content.Intent;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/scripts/perf-setup/tests/Android.bp b/scripts/perf-setup/tests/Android.bp
index 25de1d3..5de8cf0 100644
--- a/scripts/perf-setup/tests/Android.bp
+++ b/scripts/perf-setup/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_performance",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/apphealth/scenarios/tests/Android.bp b/tests/apphealth/scenarios/tests/Android.bp
index 5b424e5..43ef773 100644
--- a/tests/apphealth/scenarios/tests/Android.bp
+++ b/tests/apphealth/scenarios/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/functional/appgrid/Android.bp b/tests/automotive/functional/appgrid/Android.bp
index 4b3e077..dc7ff6f 100644
--- a/tests/automotive/functional/appgrid/Android.bp
+++ b/tests/automotive/functional/appgrid/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/functional/dialer/Android.bp b/tests/automotive/functional/dialer/Android.bp
index 1b5ed8e..e629ea2 100644
--- a/tests/automotive/functional/dialer/Android.bp
+++ b/tests/automotive/functional/dialer/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/functional/home/Android.bp b/tests/automotive/functional/home/Android.bp
index 126fd60..f6f2e58 100644
--- a/tests/automotive/functional/home/Android.bp
+++ b/tests/automotive/functional/home/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/functional/locationstatusbar/Android.bp b/tests/automotive/functional/locationstatusbar/Android.bp
index ebc9d55..6873163 100644
--- a/tests/automotive/functional/locationstatusbar/Android.bp
+++ b/tests/automotive/functional/locationstatusbar/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/functional/lockscreen/Android.bp b/tests/automotive/functional/lockscreen/Android.bp
index 6d741e4..39b7ebc 100644
--- a/tests/automotive/functional/lockscreen/Android.bp
+++ b/tests/automotive/functional/lockscreen/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/functional/mediacenter/Android.bp b/tests/automotive/functional/mediacenter/Android.bp
index 20e0f28..6e57783 100644
--- a/tests/automotive/functional/mediacenter/Android.bp
+++ b/tests/automotive/functional/mediacenter/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/functional/multiuser/Android.bp b/tests/automotive/functional/multiuser/Android.bp
index 97bdcf9..cbfb757 100644
--- a/tests/automotive/functional/multiuser/Android.bp
+++ b/tests/automotive/functional/multiuser/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/functional/navigationbar/Android.bp b/tests/automotive/functional/navigationbar/Android.bp
index e5913c7..1e0ba80 100644
--- a/tests/automotive/functional/navigationbar/Android.bp
+++ b/tests/automotive/functional/navigationbar/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/functional/notifications/Android.bp b/tests/automotive/functional/notifications/Android.bp
index 7b76ea4..27ef7c6 100644
--- a/tests/automotive/functional/notifications/Android.bp
+++ b/tests/automotive/functional/notifications/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/functional/profileicon/Android.bp b/tests/automotive/functional/profileicon/Android.bp
index 8881946..15e3b0a 100644
--- a/tests/automotive/functional/profileicon/Android.bp
+++ b/tests/automotive/functional/profileicon/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -38,8 +39,8 @@
         "longevity-device-lib",
         "platform-test-junit-rules",
     ],
-     srcs: ["src/**/*.java"],
-        certificate: "platform",
-        test_suites: ["catbox"],
-        privileged: true,
+    srcs: ["src/**/*.java"],
+    certificate: "platform",
+    test_suites: ["catbox"],
+    privileged: true,
 }
diff --git a/tests/automotive/functional/profileiconlist/Android.bp b/tests/automotive/functional/profileiconlist/Android.bp
index 38e3d46..c28db1e 100644
--- a/tests/automotive/functional/profileiconlist/Android.bp
+++ b/tests/automotive/functional/profileiconlist/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/functional/settings/Android.bp b/tests/automotive/functional/settings/Android.bp
index 1a92344..371c1a1 100644
--- a/tests/automotive/functional/settings/Android.bp
+++ b/tests/automotive/functional/settings/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/functional/statusbar/Android.bp b/tests/automotive/functional/statusbar/Android.bp
index dfd153d..dc4e523 100644
--- a/tests/automotive/functional/statusbar/Android.bp
+++ b/tests/automotive/functional/statusbar/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -42,4 +43,3 @@
         "automotive-tests",
     ],
 }
-
diff --git a/tests/automotive/functional/uxrestriction/Android.bp b/tests/automotive/functional/uxrestriction/Android.bp
index 1479e24..4d4b09d 100644
--- a/tests/automotive/functional/uxrestriction/Android.bp
+++ b/tests/automotive/functional/uxrestriction/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/health/appgrid/tests/Android.bp b/tests/automotive/health/appgrid/tests/Android.bp
index ae5a377..5eae4b2 100644
--- a/tests/automotive/health/appgrid/tests/Android.bp
+++ b/tests/automotive/health/appgrid/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/health/dial/tests/Android.bp b/tests/automotive/health/dial/tests/Android.bp
index 497f865..6d6be80 100644
--- a/tests/automotive/health/dial/tests/Android.bp
+++ b/tests/automotive/health/dial/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/health/mediacenter/tests/Android.bp b/tests/automotive/health/mediacenter/tests/Android.bp
index e9ddf15..fa90aa3 100644
--- a/tests/automotive/health/mediacenter/tests/Android.bp
+++ b/tests/automotive/health/mediacenter/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/health/multiuser/tests/Android.bp b/tests/automotive/health/multiuser/tests/Android.bp
index 3be54b4..971db7d 100644
--- a/tests/automotive/health/multiuser/tests/Android.bp
+++ b/tests/automotive/health/multiuser/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -41,6 +42,9 @@
     ],
     srcs: ["src/**/*.java"],
     certificate: "platform",
-    test_suites: ["catbox", "ats"],
+    test_suites: [
+        "catbox",
+        "ats",
+    ],
     privileged: true,
 }
diff --git a/tests/automotive/health/notification/tests/Android.bp b/tests/automotive/health/notification/tests/Android.bp
index f041ebc..01a914f 100644
--- a/tests/automotive/health/notification/tests/Android.bp
+++ b/tests/automotive/health/notification/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/health/settings/tests/Android.bp b/tests/automotive/health/settings/tests/Android.bp
index 0f102f5..1ed8b0f 100644
--- a/tests/automotive/health/settings/tests/Android.bp
+++ b/tests/automotive/health/settings/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/mobly_tests/bluetooth_palette/Android.bp b/tests/automotive/mobly_tests/bluetooth_palette/Android.bp
index 2abbbbf..d8c9a45 100644
--- a/tests/automotive/mobly_tests/bluetooth_palette/Android.bp
+++ b/tests/automotive/mobly_tests/bluetooth_palette/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/mobly_tests/connectivity/Android.bp b/tests/automotive/mobly_tests/connectivity/Android.bp
index fa33903..6b6892f 100644
--- a/tests/automotive/mobly_tests/connectivity/Android.bp
+++ b/tests/automotive/mobly_tests/connectivity/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/mobly_tests/dialer/Android.bp b/tests/automotive/mobly_tests/dialer/Android.bp
index 63be1de..be39c30 100644
--- a/tests/automotive/mobly_tests/dialer/Android.bp
+++ b/tests/automotive/mobly_tests/dialer/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/mobly_tests/media/Android.bp b/tests/automotive/mobly_tests/media/Android.bp
index cee1205..77f7cb0 100644
--- a/tests/automotive/mobly_tests/media/Android.bp
+++ b/tests/automotive/mobly_tests/media/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/mobly_tests/pairing/Android.bp b/tests/automotive/mobly_tests/pairing/Android.bp
index 2c69498..d623615 100644
--- a/tests/automotive/mobly_tests/pairing/Android.bp
+++ b/tests/automotive/mobly_tests/pairing/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/snippets/phone/Android.bp b/tests/automotive/snippets/phone/Android.bp
index 4b828c8..350cf05 100644
--- a/tests/automotive/snippets/phone/Android.bp
+++ b/tests/automotive/snippets/phone/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/bettertogether/quickstart/performance_test/Android.bp b/tests/bettertogether/quickstart/performance_test/Android.bp
index 9d4d3d1..7859456 100644
--- a/tests/bettertogether/quickstart/performance_test/Android.bp
+++ b/tests/bettertogether/quickstart/performance_test/Android.bp
@@ -13,17 +13,18 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_fwk_uwb",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 python_defaults {
-  name: "quick_start_perf_test_defaults",
-  pkg_path: "performance_test",
+    name: "quick_start_perf_test_defaults",
+    pkg_path: "performance_test",
 }
 
 python_library_host {
     name: "nc_constants",
-    defaults: ["quick_start_perf_test_defaults",],
+    defaults: ["quick_start_perf_test_defaults"],
     srcs: [
         "nc_constants.py",
     ],
@@ -33,7 +34,7 @@
 
 python_library_host {
     name: "gms_auto_updates_util",
-    defaults: ["quick_start_perf_test_defaults",],
+    defaults: ["quick_start_perf_test_defaults"],
     srcs: [
         "gms_auto_updates_util.py",
     ],
@@ -44,7 +45,7 @@
 
 python_library_host {
     name: "setup_utils",
-    defaults: ["quick_start_perf_test_defaults",],
+    defaults: ["quick_start_perf_test_defaults"],
     srcs: [
         "setup_utils.py",
     ],
@@ -57,7 +58,7 @@
 
 python_library_host {
     name: "nc_base_test",
-    defaults: ["quick_start_perf_test_defaults",],
+    defaults: ["quick_start_perf_test_defaults"],
     srcs: [
         "nc_base_test.py",
     ],
@@ -70,7 +71,7 @@
 
 python_library_host {
     name: "nearby_connection_wrapper",
-    defaults: ["quick_start_perf_test_defaults",],
+    defaults: ["quick_start_perf_test_defaults"],
     srcs: [
         "nearby_connection_wrapper.py",
     ],
@@ -84,24 +85,26 @@
 python_test_host {
     name: "quick_start_stress_test",
     main: "quick_start_stress_test.py",
-    srcs: ["quick_start_stress_test.py",],
+    srcs: ["quick_start_stress_test.py"],
     libs: [
         "nc_constants",
         "setup_utils",
         "nearby_connection_wrapper",
         "nc_base_test",
-        "mobly",],
+        "mobly",
+    ],
     test_suites: [],
     test_options: {
         unit_test: false, // as Mobly tests require device(s)
         // This tag is used to enable the ATest Mobly runner
-      	tags: ["mobly"],
+        tags: ["mobly"],
     },
     data: [
         "local_dev_testbed.yml",
         // package the snippes for atest
         ":nearby_snippet",
-        ":nearby_snippet_2",],
+        ":nearby_snippet_2",
+    ],
     version: {
         py3: {
             embedded_launcher: false,
@@ -112,13 +115,14 @@
 python_test_host {
     name: "esim_transfer_stress_test",
     main: "esim_transfer_stress_test.py",
-    srcs: ["esim_transfer_stress_test.py",],
+    srcs: ["esim_transfer_stress_test.py"],
     libs: [
         "nc_constants",
         "setup_utils",
         "nearby_connection_wrapper",
         "nc_base_test",
-        "mobly",],
+        "mobly",
+    ],
     test_suites: [],
     test_options: {
         unit_test: false, // as Mobly tests require device(s)
@@ -128,7 +132,8 @@
     data: [
         "local_esim_testbed.yml",
         // package the snippes for atest
-        ":nearby_snippet",],
+        ":nearby_snippet",
+    ],
     version: {
         py3: {
             embedded_launcher: false,
@@ -139,13 +144,14 @@
 python_test_host {
     name: "nearby_share_stress_test",
     main: "nearby_share_stress_test.py",
-    srcs: ["nearby_share_stress_test.py",],
+    srcs: ["nearby_share_stress_test.py"],
     libs: [
         "nc_constants",
         "setup_utils",
         "nearby_connection_wrapper",
         "nc_base_test",
-        "mobly",],
+        "mobly",
+    ],
     test_suites: [],
     test_options: {
         unit_test: false, // as Mobly tests require device(s)
@@ -155,7 +161,8 @@
     data: [
         "local_nearby_share_testbed.yml",
         // package the snippes for atest
-        ":nearby_snippet",],
+        ":nearby_snippet",
+    ],
     version: {
         py3: {
             embedded_launcher: false,
diff --git a/tests/codecoverage/hosttest/Android.bp b/tests/codecoverage/hosttest/Android.bp
index 584c710..ee88ebb 100644
--- a/tests/codecoverage/hosttest/Android.bp
+++ b/tests/codecoverage/hosttest/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_android_testing_experiences",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/codecoverage/instrumentation/Android.bp b/tests/codecoverage/instrumentation/Android.bp
index 99e13d0..8fae51f 100644
--- a/tests/codecoverage/instrumentation/Android.bp
+++ b/tests/codecoverage/instrumentation/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_android_testing_experiences",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/codecoverage/native/cpp/Android.bp b/tests/codecoverage/native/cpp/Android.bp
index 5f08177..e072673 100644
--- a/tests/codecoverage/native/cpp/Android.bp
+++ b/tests/codecoverage/native/cpp/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_llvm_and_toolchains",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/codecoverage/native/rust/Android.bp b/tests/codecoverage/native/rust/Android.bp
index 94d78a6..de40388 100644
--- a/tests/codecoverage/native/rust/Android.bp
+++ b/tests/codecoverage/native/rust/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_llvm_and_toolchains",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/example/instrumentation/Android.bp b/tests/example/instrumentation/Android.bp
index e1bfeb0..65006a4 100644
--- a/tests/example/instrumentation/Android.bp
+++ b/tests/example/instrumentation/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_performance",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -29,7 +30,7 @@
     test_config: "configs/hello-world.xml",
 
     test_options: {
-        extra_test_configs: ["configs/hallo-welt.xml",],
+        extra_test_configs: ["configs/hallo-welt.xml"],
     },
 
     test_suites: ["device-tests"],
diff --git a/tests/example/jarhosttest/Android.bp b/tests/example/jarhosttest/Android.bp
index 2df7dbe..49f7de4 100644
--- a/tests/example/jarhosttest/Android.bp
+++ b/tests/example/jarhosttest/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_pesto",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/example/mobly/Android.bp b/tests/example/mobly/Android.bp
index 6bdc7ad..0207b82 100644
--- a/tests/example/mobly/Android.bp
+++ b/tests/example/mobly/Android.bp
@@ -13,14 +13,15 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_partner_eng",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 python_test_host {
     name: "mobly-hello-world-test",
     main: "hello_world_test.py",
-    srcs: ["hello_world_test.py",],
-    libs: ["mobly",],
+    srcs: ["hello_world_test.py"],
+    libs: ["mobly"],
     test_suites: ["general-tests"],
     test_options: {
         unit_test: false, // as Mobly tests require device(s)
diff --git a/tests/example/mobly_multidevice/Android.bp b/tests/example/mobly_multidevice/Android.bp
index 90a3b82..f2110a1 100644
--- a/tests/example/mobly_multidevice/Android.bp
+++ b/tests/example/mobly_multidevice/Android.bp
@@ -13,13 +13,14 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_partner_eng",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 python_test_host {
     name: "mobly-multidevice-test",
     main: "multidevice_test.py",
-    srcs: ["multidevice_test.py",],
+    srcs: ["multidevice_test.py"],
     test_suites: ["general-tests"],
     test_options: {
         unit_test: false,
diff --git a/tests/example/native/Android.bp b/tests/example/native/Android.bp
index ef34c86..9de8bc8 100644
--- a/tests/example/native/Android.bp
+++ b/tests/example/native/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_tooltopia",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/example/parameterized_test/Android.bp b/tests/example/parameterized_test/Android.bp
index 36dc6fc..98b000d 100644
--- a/tests/example/parameterized_test/Android.bp
+++ b/tests/example/parameterized_test/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_pesto",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -25,4 +26,4 @@
 
     static_libs: ["androidx.test.runner"],
     certificate: "platform",
-}
\ No newline at end of file
+}
diff --git a/tests/example/perf/Android.bp b/tests/example/perf/Android.bp
index 25210e7..1256468 100644
--- a/tests/example/perf/Android.bp
+++ b/tests/example/perf/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_partner_eng",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/example/stubtest/Android.bp b/tests/example/stubtest/Android.bp
index aa271e1..d3275df 100644
--- a/tests/example/stubtest/Android.bp
+++ b/tests/example/stubtest/Android.bp
@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_team: "trendy_team_testing",
+}
+
 java_test_host {
     name: "DeviceLongPollingStubTest",
     srcs: ["src/**/*.java"],
diff --git a/tests/functional/devicehealthchecks/Android.bp b/tests/functional/devicehealthchecks/Android.bp
index a9ddc2e..4c82742 100644
--- a/tests/functional/devicehealthchecks/Android.bp
+++ b/tests/functional/devicehealthchecks/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_test_eng_comms_power",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/functional/overviewtests/Android.bp b/tests/functional/overviewtests/Android.bp
index fe7637c..f6f7c7e 100644
--- a/tests/functional/overviewtests/Android.bp
+++ b/tests/functional/overviewtests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_build",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/functional/permission/Android.bp b/tests/functional/permission/Android.bp
index 0c8281f..4f249ec 100644
--- a/tests/functional/permission/Android.bp
+++ b/tests/functional/permission/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_camera_app",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/functional/testapks/applinktestapp/Android.bp b/tests/functional/testapks/applinktestapp/Android.bp
index 1f83b23..b98e197 100644
--- a/tests/functional/testapks/applinktestapp/Android.bp
+++ b/tests/functional/testapks/applinktestapp/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_android_permissions",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/health/scenarios/tests/Android.bp b/tests/health/scenarios/tests/Android.bp
index 0e27a23..24fca27 100644
--- a/tests/health/scenarios/tests/Android.bp
+++ b/tests/health/scenarios/tests/Android.bp
@@ -15,6 +15,7 @@
 // TODO(harrytczhang@): Refactor to share command with the similar genrule in samples. See
 // b/119635583 for similar bug.
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -41,14 +42,14 @@
         "&& if ! ($(location aprotoc) --encode=longevity.profile.Configuration " +
         "$(location :profile-proto-def) < $$file > " +
         "$$out_dir/$$assets_dir/$${fname//.textpb/.pb}) ; then " +
-        "echo \"\033[0;31mFailed to parse profile $$file. See above for errors.\033[0m\" " +
+        "echo \"\x1b[0;31mFailed to parse profile $$file. See above for errors.\x1b[0m\" " +
         "&& exit 1 ; fi ; done && jar cf $(out) -C $$(dirname $(out)) $$assets_dir",
 }
 
 java_library_static {
     name: "common-platform-scenario-tests",
     sdk_version: "test_current",
-    srcs: [ "src/**/*.java" ],
+    srcs: ["src/**/*.java"],
     libs: [
         "common-platform-scenarios",
         "guava",
diff --git a/tests/jank/UbSystemUiJankTests/Android.bp b/tests/jank/UbSystemUiJankTests/Android.bp
index 44f2170..9a05e9f 100644
--- a/tests/jank/UbSystemUiJankTests/Android.bp
+++ b/tests/jank/UbSystemUiJankTests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_gesture_nav",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/jank/androidtvjanktests/Android.bp b/tests/jank/androidtvjanktests/Android.bp
index a59614b..eb8082b 100644
--- a/tests/jank/androidtvjanktests/Android.bp
+++ b/tests/jank/androidtvjanktests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/jank/dialer/Android.bp b/tests/jank/dialer/Android.bp
index b933636..0f46e9c 100644
--- a/tests/jank/dialer/Android.bp
+++ b/tests/jank/dialer/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_partner_eng",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/jank/jankmicrobenchmark/Android.bp b/tests/jank/jankmicrobenchmark/Android.bp
index 715b494..91a3749 100644
--- a/tests/jank/jankmicrobenchmark/Android.bp
+++ b/tests/jank/jankmicrobenchmark/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/jank/sysapp_wear/Android.bp b/tests/jank/sysapp_wear/Android.bp
index f6b0524..bd49143 100644
--- a/tests/jank/sysapp_wear/Android.bp
+++ b/tests/jank/sysapp_wear/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_partner_eng",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/jank/touch_latency_wear/Android.bp b/tests/jank/touch_latency_wear/Android.bp
index 1fb20a5..3069f37 100644
--- a/tests/jank/touch_latency_wear/Android.bp
+++ b/tests/jank/touch_latency_wear/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/jank/uibench/Android.bp b/tests/jank/uibench/Android.bp
index 39c61e3..16912c6 100644
--- a/tests/jank/uibench/Android.bp
+++ b/tests/jank/uibench/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_test_eng_comms_power",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/jank/uibench_wear/Android.bp b/tests/jank/uibench_wear/Android.bp
index 0274258..89c3509 100644
--- a/tests/jank/uibench_wear/Android.bp
+++ b/tests/jank/uibench_wear/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_test_eng_comms_power",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/jank/webview/Android.bp b/tests/jank/webview/Android.bp
index c438d25..32a406f 100644
--- a/tests/jank/webview/Android.bp
+++ b/tests/jank/webview/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_android_testing_experiences",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/microbenchmarks/LauncherIconsApp/Android.bp b/tests/microbenchmarks/LauncherIconsApp/Android.bp
index e713b6e..9d80dfc 100644
--- a/tests/microbenchmarks/LauncherIconsApp/Android.bp
+++ b/tests/microbenchmarks/LauncherIconsApp/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_test_eng_comms_power",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/microbenchmarks/uibench/Android.bp b/tests/microbenchmarks/uibench/Android.bp
index 4bc93c7..4d8667f 100644
--- a/tests/microbenchmarks/uibench/Android.bp
+++ b/tests/microbenchmarks/uibench/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -30,16 +31,20 @@
 
     libs: ["android.test.base.stubs"],
 
-    data: [":perfetto_artifacts",
-           ":UiBench",],
+    data: [
+        ":perfetto_artifacts",
+        ":UiBench",
+    ],
 
     sdk_version: "test_current",
 
     test_config: "configs/uibench-all.xml",
 
     test_options: {
-        extra_test_configs: ["configs/uibench-dialoglist.xml",
-                             "configs/uibench-invalidate.xml",],
+        extra_test_configs: [
+            "configs/uibench-dialoglist.xml",
+            "configs/uibench-invalidate.xml",
+        ],
     },
 
     test_suites: ["device-tests"],
diff --git a/tests/perf/BootHelperApp/Android.bp b/tests/perf/BootHelperApp/Android.bp
index 6d5642c..7f6b10e 100644
--- a/tests/perf/BootHelperApp/Android.bp
+++ b/tests/perf/BootHelperApp/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/perf/PerfTransitionTest/Android.bp b/tests/perf/PerfTransitionTest/Android.bp
index d5f7b22..6dcecb7 100644
--- a/tests/perf/PerfTransitionTest/Android.bp
+++ b/tests/perf/PerfTransitionTest/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_platform_build",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/perf/PerformanceAppTest/Android.bp b/tests/perf/PerformanceAppTest/Android.bp
index 8d9a091..cd9667a 100644
--- a/tests/perf/PerformanceAppTest/Android.bp
+++ b/tests/perf/PerformanceAppTest/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/perf/PerformanceLaunch/Android.bp b/tests/perf/PerformanceLaunch/Android.bp
index c014dc4..fc5aac9 100644
--- a/tests/perf/PerformanceLaunch/Android.bp
+++ b/tests/perf/PerformanceLaunch/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_launcher",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/perf/PowerPerfTest/Android.bp b/tests/perf/PowerPerfTest/Android.bp
index 3a159b9..f442a52 100644
--- a/tests/perf/PowerPerfTest/Android.bp
+++ b/tests/perf/PowerPerfTest/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/utils/esimutility/Android.bp b/utils/esimutility/Android.bp
index a34478a..e449680 100644
--- a/utils/esimutility/Android.bp
+++ b/utils/esimutility/Android.bp
@@ -15,6 +15,7 @@
 //
 
 package {
+    default_team: "trendy_team_test_eng_comms_power",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/utils/permissions/Android.bp b/utils/permissions/Android.bp
index f80da00..270e7b8 100644
--- a/utils/permissions/Android.bp
+++ b/utils/permissions/Android.bp
@@ -15,6 +15,7 @@
 //
 
 package {
+    default_team: "trendy_team_testing",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/utils/wifistrengthscanner/Android.bp b/utils/wifistrengthscanner/Android.bp
index 2439221..9a483f9 100644
--- a/utils/wifistrengthscanner/Android.bp
+++ b/utils/wifistrengthscanner/Android.bp
@@ -15,6 +15,7 @@
 //
 
 package {
+    default_team: "trendy_team_test_eng_comms_power",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }