diff --git a/TRACE_OWNERS b/TRACE_OWNERS
new file mode 100644
index 000000000000..f746a162bc8f
--- /dev/null
+++ b/TRACE_OWNERS
@@ -0,0 +1,5 @@
+# OWNERS of Trace-related files
+primiano@google.com
+timmurray@google.com
+jjaggi@google.com
+jreck@google.com
diff --git a/core/java/android/os/OWNERS b/core/java/android/os/OWNERS
index 5d9f2189df1b..6b31cf7ade09 100644
--- a/core/java/android/os/OWNERS
+++ b/core/java/android/os/OWNERS
@@ -63,3 +63,6 @@ per-file *UpdateEngine* = file:/platform/system/update_engine:/OWNERS
 
 # VINTF
 per-file Vintf* = file:/platform/system/libvintf:/OWNERS
+
+# Tracing
+per-file Trace.java = file:/TRACE_OWNERS
diff --git a/core/jni/OWNERS b/core/jni/OWNERS
index 6144299ca23b..ce2adc63bbfa 100644
--- a/core/jni/OWNERS
+++ b/core/jni/OWNERS
@@ -55,7 +55,7 @@ per-file android_media_* = file:/media/java/android/media/OWNERS
 per-file android_media_midi_* = file:/media/java/android/media/midi/OWNERS
 per-file android_opengl_* = file:/opengl/java/android/opengl/OWNERS
 per-file android_os_storage_* = file:/core/java/android/os/storage/OWNERS
-per-file android_os_Trace* = jjaggi@google.com, jreck@google.com, primiano@google.com, timmurray@google.com
+per-file android_os_Trace* = file:/TRACE_OWNERS
 per-file android_se_* = file:/omapi/java/android/se/OWNERS
 per-file android_security_* = file:/core/java/android/security/OWNERS
 per-file android_view_* = file:/core/java/android/view/OWNERS