diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index 0664c30..0000000
--- a/Android.bp
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// Copyright (C) 2021 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 {
-    default_applicable_licenses: ["packages_modules_GeoTZ_license"],
-}
-
-// Added automatically by a large-scale-change that took the approach of
-// 'apply every license found to every target'. While this makes sure we respect
-// every license restriction, it may not be entirely correct.
-//
-// e.g. GPL in an MIT project might only apply to the contrib/ directory.
-//
-// Please consider splitting the single license below into multiple licenses,
-// taking care not to lose any license_kind information, and overriding the
-// default license using the 'licenses: [...]' property on targets as needed.
-//
-// For unused files, consider creating a 'fileGroup' with "//visibility:private"
-// to attach the license to, and including a comment whether the files may be
-// used in the current project.
-// See: http://go/android-license-faq
-license {
-    name: "packages_modules_GeoTZ_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-        "legacy_restricted",
-    ],
-    // large-scale-change unable to identify any license_text files
-}
diff --git a/data_pipeline/Android.bp b/data_pipeline/Android.bp
index 57575b8..1725777 100644
--- a/data_pipeline/Android.bp
+++ b/data_pipeline/Android.bp
@@ -15,12 +15,24 @@
 // Proto library
 package {
     // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "packages_modules_GeoTZ_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    //   legacy_restricted
-    default_applicable_licenses: ["packages_modules_GeoTZ_license"],
+    default_applicable_licenses: [
+        "Android-Apache-2.0",
+        "packages_modules_GeoTZ_data_pipeline_license",
+    ],
+}
+
+license {
+    name: "packages_modules_GeoTZ_data_pipeline_license",
+    license_kinds: ["legacy_restricted"],
+    license_text: [
+        "src/test/java/com/android/timezone/location/data_pipeline/steps/canonicalizetzs2polygons/data/input_polygons/LICENSE",
+        "src/test/java/com/android/timezone/location/data_pipeline/steps/canonicalizetzs2polygons/data/output_polygons/LICENSE",
+        "src/test/java/com/android/timezone/location/data_pipeline/steps/createtzs2protodatafile/data/LICENSE",
+        "src/test/java/com/android/timezone/location/data_pipeline/steps/geojsontz_to_tzs2polygons/data/LICENSE",
+        "src/test/java/com/android/timezone/location/data_pipeline/steps/mergetzs2ranges/data/LICENSE",
+        "src/test/java/com/android/timezone/location/data_pipeline/steps/tzs2cellunions_to_tzs2ranges/data/LICENSE",
+        "src/test/java/com/android/timezone/location/data_pipeline/steps/tzs2polygons_tzs2cellunions/data/LICENSE",
+    ],
 }
 
 java_library_host {
diff --git a/output_data/Android.bp b/output_data/Android.bp
index 177a6f7..cc92b7c 100644
--- a/output_data/Android.bp
+++ b/output_data/Android.bp
@@ -15,11 +15,13 @@
 // The tzs2.dat file containing time zone geo data for inclusion in the tzdata APEX file.
 package {
     // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "packages_modules_GeoTZ_license"
-    // to get the below license kinds:
-    //   legacy_restricted
-    default_applicable_licenses: ["packages_modules_GeoTZ_license"],
+    default_applicable_licenses: ["packages_modules_GeoTZ_output_data_license"],
+}
+
+license {
+    name: "packages_modules_GeoTZ_output_data_license",
+    license_kinds: ["legacy_restricted"],
+    license_text: ["odbl/LICENSE"],
 }
 
 prebuilt_etc {
diff --git a/tzbb_data/Android.bp b/tzbb_data/Android.bp
new file mode 100644
index 0000000..71d2ad2
--- /dev/null
+++ b/tzbb_data/Android.bp
@@ -0,0 +1,32 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: [
+        "packages_modules_GeoTZ_tzbb_license",
+    ],
+}
+
+// See: http://go/android-license-faq
+license {
+    name: "packages_modules_GeoTZ_tzbb_license",
+    package_name: "Timezone Boundary Builder",
+    license_kinds: ["legacy_restricted"],
+    license_text: ["DATA_LICENSE"],
+}
+
+filegroup {
+    name: "packages_modules_GeoTZ_tzbb",
+    srcs: ["*.zip"],
+}