diff --git a/OWNERS b/OWNERS
index 81cfdb8..46bd5b1 100644
--- a/OWNERS
+++ b/OWNERS
@@ -2,6 +2,6 @@
 # Please update this list if you find better candidates.
 tonymak@google.com
 toki@google.com
-zilka@google.com
-mns@google.com
-jalt@google.com
+licha@google.com
+joannechung@google.com
+lpeter@google.com
\ No newline at end of file
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 72e022b..370acd6 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -21,6 +21,25 @@
       "name": "TCSModelDownloaderIntegrationTest"
     }
   ],
+  "hwasan-postsubmit": [
+    {
+      "name": "TextClassifierServiceTest",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    },
+    {
+      "name": "libtextclassifier_tests"
+    },
+    {
+      "name": "libtextclassifier_java_tests"
+    },
+    {
+      "name": "TextClassifierNotificationTests"
+    }
+  ],
   "mainline-presubmit": [
     {
       "name": "TextClassifierNotificationTests[com.google.android.extservices.apex]"
diff --git a/abseil-cpp/Android.bp b/abseil-cpp/Android.bp
index a3635f3..0ab3734 100644
--- a/abseil-cpp/Android.bp
+++ b/abseil-cpp/Android.bp
@@ -35,7 +35,7 @@
     export_include_dirs: ["."],
     visibility: [
         "//external/libtextclassifier:__subpackages__",
-        "//external/tflite-support:__subpackages__"
+        "//external/tflite-support:__subpackages__",
     ],
     srcs: [
         "absl/**/*.cc",
@@ -43,6 +43,7 @@
     apex_available: [
         "//apex_available:platform",
         "com.android.extservices",
+        "com.android.adservices",
     ],
     sdk_version: "current",
     min_sdk_version: "30",
diff --git a/native/Android.bp b/native/Android.bp
index a0ca6a4..b80c979 100644
--- a/native/Android.bp
+++ b/native/Android.bp
@@ -31,6 +31,7 @@
         "com.android.neuralnetworks",
         "test_com.android.neuralnetworks",
     ],
+    sdk_version: "current",
 }
 
 cc_defaults {
@@ -65,6 +66,7 @@
         "com.android.neuralnetworks",
         "test_com.android.neuralnetworks",
         "com.android.extservices",
+        "com.android.adservices",
     ],
 }
 
@@ -129,7 +131,7 @@
         "liblua",
         "libutf",
         "libtflite_static",
-        "tflite_support",
+        "tflite_support"
     ],
 }
 
@@ -245,7 +247,7 @@
         "libtextclassifier",
     ],
     header_libs: [
-    	"libtextclassifier_flatbuffer_testonly_headers",
+        "libtextclassifier_flatbuffer_testonly_headers",
     ],
 }
 
diff --git a/proto/Android.bp b/proto/Android.bp
index c1c2825..6b67752 100644
--- a/proto/Android.bp
+++ b/proto/Android.bp
@@ -14,6 +14,15 @@
 // limitations under the License.
 //
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_libtextclassifier_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["external_libtextclassifier_license"],
+}
+
 java_library {
     name: "textclassifier-java-proto-lite",
     proto: {
@@ -28,4 +37,3 @@
         "com.android.extservices",
     ],
 }
-