diff --git a/Android.bp b/Android.bp
index 00984ef..6edb2e3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_android_kernel",
     default_applicable_licenses: ["system_libhidl_license"],
 }
 
diff --git a/fuzzer/Android.bp b/fuzzer/Android.bp
index 5f95ce7..a40ee9c 100644
--- a/fuzzer/Android.bp
+++ b/fuzzer/Android.bp
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+package {
+    default_team: "trendy_team_android_kernel",
+}
+
 cc_defaults {
     name: "libHidlBase_fuzzer_defaults",
     host_supported: true,
@@ -54,6 +58,6 @@
 
 cc_fuzz {
     name: "libHidlBase_parcel_fuzzer",
-    srcs: ["libHidlBase_parcel_fuzzer.cpp",],
+    srcs: ["libHidlBase_parcel_fuzzer.cpp"],
     defaults: ["libHidlBase_fuzzer_defaults"],
 }
diff --git a/transport/allocator/1.0/vts/functional/Android.bp b/transport/allocator/1.0/vts/functional/Android.bp
index f53fc4f..58047cb 100644
--- a/transport/allocator/1.0/vts/functional/Android.bp
+++ b/transport/allocator/1.0/vts/functional/Android.bp
@@ -15,6 +15,7 @@
 //
 
 package {
+    default_team: "trendy_team_android_kernel",
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
     // all of the 'license_kinds' from "system_libhidl_license"
@@ -33,5 +34,8 @@
     static_libs: [
         "android.hidl.allocator@1.0",
     ],
-    test_suites: ["general-tests", "vts"],
+    test_suites: [
+        "general-tests",
+        "vts",
+    ],
 }
diff --git a/transport/base/1.0/vts/functional/Android.bp b/transport/base/1.0/vts/functional/Android.bp
index a2a3484..a5a7c33 100644
--- a/transport/base/1.0/vts/functional/Android.bp
+++ b/transport/base/1.0/vts/functional/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_android_kernel",
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
     // all of the 'license_kinds' from "system_libhidl_license"