Merge "Use make variables to access java tools"
diff --git a/OWNERS b/OWNERS
index bfea906..f2e8ba9 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,6 +1,18 @@
-agampe@google.com
+# For JDWP changes:
 allight@google.com
 oth@google.com
-narayan@google.com
 ngeoffray@google.com
+shertz@google.com
+
+# For build / style / minor test fixes:
+agampe@google.com
+flooey@google.com
+jsauer@google.com
+narayan@google.com
+nfuller@google.com
+paulduffin@google.com
+peteg@google.com
+pszczepaniak@google.com
 sehr@google.com
+tobiast@google.com
+vichang@google.com