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

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

Index: build/android/pylib/results/flakiness_dashboard/results_uploader.py
diff --git a/build/android/pylib/results/flakiness_dashboard/results_uploader.py b/build/android/pylib/results/flakiness_dashboard/results_uploader.py
index 856fa9c72eecacee2728ce8e8f9cb95cbe7a798d..b86d7acd70a6707e63cd908aaec5230816d22c97 100644
--- a/build/android/pylib/results/flakiness_dashboard/results_uploader.py
+++ b/build/android/pylib/results/flakiness_dashboard/results_uploader.py
@@ -106,6 +106,9 @@ class ResultsUploader(object):
       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 = {}