Merge "Use registered users in libyuv OWNERS files."
diff --git a/files/OWNERS b/files/OWNERS
index 4e44815..c1f7308 100644
--- a/files/OWNERS
+++ b/files/OWNERS
@@ -1,6 +1,7 @@
fbarchard@google.com
-magjed@chromium.org
-torbjorng@chromium.org
+kjellander@google.com
+# magjed@chromium.org
+# torbjorng@chromium.org
per-file *.gyp=kjellander@google.com
per-file *.gn=kjellander@google.com
diff --git a/files/tools/OWNERS b/files/tools/OWNERS
index 4c34d7c..e96cf04 100644
--- a/files/tools/OWNERS
+++ b/files/tools/OWNERS
@@ -1 +1,2 @@
+fbarchard@google.com
kjellander@google.com
diff --git a/files/tools/msan/OWNERS b/files/tools/msan/OWNERS
index 39ad733..ab97cb0 100644
--- a/files/tools/msan/OWNERS
+++ b/files/tools/msan/OWNERS
@@ -1,3 +1,3 @@
-pbos@chromium.org
+# pbos@chromium.org
+fbarchard@google.com
kjellander@google.com
-
diff --git a/files/tools/ubsan/OWNERS b/files/tools/ubsan/OWNERS
index 7690a2c..32b7466 100644
--- a/files/tools/ubsan/OWNERS
+++ b/files/tools/ubsan/OWNERS
@@ -1,4 +1,3 @@
-pbos@webrtc.org
+# pbos@webrtc.org
kjellander@google.com
fbarchard@google.com
-
