diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..5a04fd2
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,6 @@
+vichang@google.com
+mingaleev@google.com
+oth@google.com
+ngeoffray@google.com
+
+include platform/packages/modules/common:/MODULES_OWNERS  # see go/mainline-owners-policy
diff --git a/apex/Android.bp b/apex/Android.bp
index 5e83de8..bfec55c 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -48,7 +48,8 @@
         "i18n-bootclasspath-fragment",
     ],
     updatable: false,
-    generate_hashtree: false,
+    // Need hash tree so that CompOS can use dm-verity to verify the image in the Protected VM.
+    generate_hashtree: true,
 }
 
 apex_key {
@@ -94,6 +95,23 @@
         max_target_o_low_priority: [
             "hiddenapi/hiddenapi-max-target-o-low-priority.txt",
         ],
+
+        // This module does not contain any split packages.
+        split_packages: [],
+
+        // The following packages and all their subpackages currently only
+        // contain classes from this bootclasspath_fragment. Listing a package
+        // here won't prevent other bootclasspath modules from adding classes in
+        // any of those packages but it will prevent them from adding those
+        // classes into an API surface, e.g. public, system, etc.. Doing so will
+        // result in a build failure due to inconsistent flags.
+        package_prefixes: [
+            "android.icu",
+            "com.android.i18n.system",
+            "com.android.i18n.timezone",
+            "com.android.i18n.util",
+            "com.android.icu",
+        ],
     },
 }
 
@@ -112,12 +130,7 @@
             ],
         },
     },
-    native_header_libs: [
-        "libandroidicu_headers",
-        "libicuuc_headers",
-    ],
     native_shared_libs: [
-        "libandroidicu",
         "libicu",
     ],
 }