[polymer] Merge of master into polymer10-migration

PRESUBMIT.py

Index: PRESUBMIT.py
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 5275462da7f7b1629a446d5b991d97e2075cc091..e2dd0e3c14fb90fe56c7a7d5dbe0619f2676bdde 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -44,18 +44,6 @@ _CATAPULT_BUG_ID_RE = re.compile(r'#[1-9]\d*')
 _RIETVELD_BUG_ID_RE = re.compile(r'[1-9]\d*')
 _RIETVELD_REPOSITORY_NAMES = frozenset({'chromium', 'v8'})
 
-
-def GetPreferredTryMasters(project, change):
-  return {
-      'tryserver.client.catapult': {
-          'Catapult Android Tryserver': {'defaulttests'},
-          'Catapult Linux Tryserver': {'defaulttests'},
-          'Catapult Mac Tryserver': {'defaulttests'},
-          'Catapult Windows Tryserver': {'defaulttests'},
-      }
-  }
-
-
 def CheckChangeLogBug(input_api, output_api):
   # Show a presubmit message if there is no BUG= line.
   if input_api.change.BUG is None: