diff --git a/keystore/tests/Android.bp b/keystore/tests/Android.bp
index e641f44..c3a9e66 100644
--- a/keystore/tests/Android.bp
+++ b/keystore/tests/Android.bp
@@ -1,6 +1,7 @@
 // Unit test for AuthTokenTable
 
 package {
+    default_team: "trendy_team_android_hardware_backed_security",
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
     // all of the 'license_kinds' from "system_security_license"
@@ -41,9 +42,9 @@
         "libkeystore-attestation-application-id",
         "libvndksupport",
     ],
-   sanitize: {
-     cfi: false,
-   }
+    sanitize: {
+        cfi: false,
+    },
 }
 
 cc_test {
@@ -68,7 +69,7 @@
     shared_libs: [
         "libbinder_ndk",
     ],
-   sanitize: {
-     cfi: false,
-   }
+    sanitize: {
+        cfi: false,
+    },
 }
diff --git a/keystore/tests/fuzzer/Android.bp b/keystore/tests/fuzzer/Android.bp
index d459f75..55d8f83 100644
--- a/keystore/tests/fuzzer/Android.bp
+++ b/keystore/tests/fuzzer/Android.bp
@@ -15,6 +15,7 @@
  */
 
 package {
+    default_team: "trendy_team_android_hardware_backed_security",
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
     // all of the 'license_kinds' from "system_security_license"