Manual partial update from from https://crrev.com/337502

build/android/pylib/results/flakiness_dashboard/results_uploader.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Uploads the results to the flakiness dashboard server."""
 # pylint: disable=E1002,R0201
 
 import logging
 import os
 import shutil
@@ skipping 88 matching lines @@
       # This requires passing the actual master name (e.g. 'ChromiumFYI' not
       # 'chromium.fyi').
       from slave import slave_utils # pylint: disable=F0401
       self._build_name = slave_utils.SlaveBuildName(constants.DIR_SOURCE_ROOT)
       self._master_name = slave_utils.GetActiveMaster()
     else:
       self._build_name = 'chromium-android'
       buildbot_branch = os.environ.get('BUILDBOT_BRANCH')
       if not buildbot_branch:
         buildbot_branch = 'master'
+      else:
+        # Ensure there's no leading "origin/"
+        buildbot_branch = buildbot_branch[buildbot_branch.find('/') + 1:]
       self._master_name = '%s-%s' % (self._build_name, buildbot_branch)
 
     self._test_results_map = {}
 
   def AddResults(self, test_results):
     # TODO(frankf): Differentiate between fail/crash/timeouts.
     conversion_map = [
         (test_results.GetPass(), False,
             json_results_generator.JSONResultsGeneratorBase.PASS_RESULT),
         (test_results.GetFail(), True,
@@ skipping 50 matching lines @@
   """Reports test results to the flakiness dashboard for Chrome for Android.
 
   Args:
     results: test results.
     flakiness_dashboard_server: the server to upload the results to.
     test_type: the type of the tests (as displayed by the flakiness dashboard).
   """
   uploader = ResultsUploader(test_type)
   uploader.AddResults(results)
   uploader.Upload(flakiness_dashboard_server)