diff --git a/src/com/android/settings/development/OWNERS b/src/com/android/settings/development/OWNERS
index 9ffcc47..ecdc4df 100644
--- a/src/com/android/settings/development/OWNERS
+++ b/src/com/android/settings/development/OWNERS
@@ -1,8 +1,9 @@
 # Default reviewers for this and subdirectories.
-asargent@google.com
-dling@google.com
-zhfan@google.com
+edgarwang@google.com
+emilychuang@google.com
+rafftsai@google.com
+tmfang@google.com
+
 
 # Emergency approvers in case the above are not available
-asapperstein@google.com
-miket@google.com
+zhfan@google.com
diff --git a/src/com/android/settings/wifi/OWNERS b/src/com/android/settings/wifi/OWNERS
index 3090f13..ab0af7c 100644
--- a/src/com/android/settings/wifi/OWNERS
+++ b/src/com/android/settings/wifi/OWNERS
@@ -1,9 +1,4 @@
 # Default reviewers for this and subdirectories.
-asargent@google.com
-easchwar@google.com
-dling@google.com
-jlapenna@google.com
-sghuman@google.com
-zhfan@google.com
-
-# Emergency approvers in case the above are not available
\ No newline at end of file
+govenliu@google.com
+arcwang@google.com
+tmfang@google.com