diff --git a/WATCHLISTS b/WATCHLISTS
index 0c7e2dd5f..5d0e022bb 100644
--- a/WATCHLISTS
+++ b/WATCHLISTS
@@ -29,6 +29,9 @@
     'build_files': {
       'filepath': '\.gyp$|\.gypi$|Android\.mk$',
     },
+    'java_files': {
+      'filepath': '\.java$|\.xml$',
+    },
     'video_engine': {
       'filepath': 'src/video_engine/.*',
     },
@@ -78,16 +81,20 @@
                    'niklas.enbom@webrtc.org'],
     'documented_interfaces': ['amyfong@webrtc.org'],
     'build_files': ['leozwang@webrtc.org'],
+    'java_files': ['leozwang@webrtc.org'],
     'common_audio': ['bjornv@webrtc.org',
                      'andrew@webrtc.org'],
     'video_engine': ['mflodman@webrtc.org',
                      'perkj@webrtc.org'],
     'voice_engine': ['henrika@webrtc.org'],
     'video_capture': ['mflodman@webrtc.org',
-                      'perkj@webrtc.org'],
+                      'perkj@webrtc.org',
+                      'leozwang@webrtc.org'],
     'video_render': ['mflodman@webrtc.org',
-                     'perkj@webrtc.org'],
-    'audio_device': ['henrika@webrtc.org'],
+                     'perkj@webrtc.org',
+                     'leozwang@webrtc.org'],
+    'audio_device': ['henrika@webrtc.org',
+                     'leozwang@webrtc.org'],
     'audio_coding': ['tina.legrand@webrtc.org'],
     'NetEQ': ['henrik.lundin@webrtc.org'],
     'audio_processing': ['andrew@webrtc.org',