diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..b955d02
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,8 @@
+# Bug component: 760438
+
+helenparsons@google.com
+hgchen@google.com
+rgl@google.com
+saagarp@google.com
+shaopengjia@google.com
+wyau@google.com
\ No newline at end of file
diff --git a/audio_proxy/Android.bp b/audio_proxy/Android.bp
index 3c926bd..8bf624b 100644
--- a/audio_proxy/Android.bp
+++ b/audio_proxy/Android.bp
@@ -1,7 +1,7 @@
 cc_library {
   name: "libaudio_proxy.google",
 
-  product_specific: true,
+  system_ext_specific: true,
 
   srcs: [
     "AudioProxy.cpp",
@@ -29,7 +29,7 @@
 cc_defaults {
   name: "libaudio_proxy_client_default",
 
-  product_specific: true,
+  system_ext_specific: true,
 
   srcs: [
     "AudioProxyDevice.cpp",
diff --git a/audio_proxy/interfaces/5.0/Android.bp b/audio_proxy/interfaces/5.0/Android.bp
index 85ca5a3..05d48fe 100644
--- a/audio_proxy/interfaces/5.0/Android.bp
+++ b/audio_proxy/interfaces/5.0/Android.bp
@@ -3,7 +3,7 @@
 hidl_interface {
     name: "device.google.atv.audio_proxy@5.0",
     root: "device.google.atv.audio_proxy",
-    product_specific: true,
+    system_ext_specific: true,
     srcs: [
         "IAudioProxyDevicesManager.hal",
         "IBusDevice.hal",