diff --git a/OWNERS b/OWNERS
index 80138fffcee..93e04a7652e 100644
--- a/OWNERS
+++ b/OWNERS
@@ -3,13 +3,20 @@ android-settings-core-eng+gerrit@google.com
 
 # People who can approve changes for submission
 arcwang@google.com
+chaohuiw@google.com
 chiujason@google.com
+cyl@google.com
 edgarwang@google.com
-emilychuang@google.com
+llz@google.com
 millchen@google.com
+songchenxi@google.com
 stanleytfwang@google.com
 sunnyshao@google.com
 yantingyang@google.com
+ykhung@google.com
+
+# Emergency only
+lijun@google.com
 
 # Exempt resource files (because they are in a flat directory and too hard to manage via OWNERS)
 per-file *.xml=*