Merge remote branch 'cros/upstream' into tempbranch

scheduler/monitor_db.py

Index: scheduler/monitor_db.py
diff --git a/scheduler/monitor_db.py b/scheduler/monitor_db.py
index 2d878bbf50dfd1d8b9619e4887d9add05eee7638..c5abed32a4896e7f6f8f748755a84c3b650c369f 100755
--- a/scheduler/monitor_db.py
+++ b/scheduler/monitor_db.py
@@ -53,10 +53,16 @@ system error on the Autotest server.  Full results may not be available.  Sorry.
 _db = None
 _shutdown = False
 _autoserv_path = os.path.join(drones.AUTOTEST_INSTALL_DIR, 'server', 'autoserv')
-_parser_path = os.path.join(drones.AUTOTEST_INSTALL_DIR, 'tko', 'parse')
 _testing_mode = False
 _drone_manager = None
 
+def _parser_path_default(install_dir):
+    return os.path.join(install_dir, 'tko', 'parse')
+_parser_path_func = utils.import_site_function(
+        __file__, 'autotest_lib.scheduler.site_monitor_db',
+        'parser_path', _parser_path_default)
+_parser_path = _parser_path_func(drones.AUTOTEST_INSTALL_DIR)
+
 
 def _get_pidfile_timeout_secs():
     """@returns How long to wait for autoserv to write pidfile."""