| Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_coverage.json
 | 
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_coverage.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_coverage.json
 | 
| index 96f1b3c1280fcc808b72f6967070040767eb0c5a..5212fb804d64a5861a5b924bc80ba6f7c5594acb 100644
 | 
| --- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_coverage.json
 | 
| +++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_coverage.json
 | 
| @@ -721,6 +721,19 @@
 | 
|      ]
 | 
|    },
 | 
|    {
 | 
| +    "cmd": [],
 | 
| +    "cwd": "[BUILDER_CACHE]/android",
 | 
| +    "env": {
 | 
| +      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
| +      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
 | 
| +    },
 | 
| +    "name": "AndroidWebViewTest with patch",
 | 
| +    "~followup_annotations": [
 | 
| +      "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
 | 
| +      "@@@STEP_FAILURE@@@"
 | 
| +    ]
 | 
| +  },
 | 
| +  {
 | 
|      "cmd": [
 | 
|        "python",
 | 
|        "-u",
 | 
| @@ -740,10 +753,10 @@
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
|        "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
 | 
|      },
 | 
| -    "name": "AndroidWebViewTest (with patch)",
 | 
| +    "name": "AndroidWebViewTest with patch.AndroidWebViewTest (with patch)",
 | 
|      "~followup_annotations": [
 | 
| +      "@@@STEP_NEST_LEVEL@1@@@",
 | 
|        "step returned non-zero exit code: 1",
 | 
| -      "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
 | 
|        "@@@STEP_FAILURE@@@"
 | 
|      ]
 | 
|    },
 | 
| @@ -772,7 +785,23 @@
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
|        "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
 | 
|      },
 | 
| -    "name": "Upload to test-results [AndroidWebViewTest]"
 | 
| +    "name": "AndroidWebViewTest with patch.Upload to test-results [AndroidWebViewTest]",
 | 
| +    "~followup_annotations": [
 | 
| +      "@@@STEP_NEST_LEVEL@1@@@"
 | 
| +    ]
 | 
| +  },
 | 
| +  {
 | 
| +    "cmd": [],
 | 
| +    "cwd": "[BUILDER_CACHE]/android",
 | 
| +    "env": {
 | 
| +      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
| +      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
 | 
| +    },
 | 
| +    "name": "ChromePublicTest with patch",
 | 
| +    "~followup_annotations": [
 | 
| +      "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
 | 
| +      "@@@STEP_FAILURE@@@"
 | 
| +    ]
 | 
|    },
 | 
|    {
 | 
|      "cmd": [
 | 
| @@ -794,10 +823,10 @@
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
|        "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
 | 
|      },
 | 
| -    "name": "ChromePublicTest (with patch)",
 | 
| +    "name": "ChromePublicTest with patch.ChromePublicTest (with patch)",
 | 
|      "~followup_annotations": [
 | 
| +      "@@@STEP_NEST_LEVEL@1@@@",
 | 
|        "step returned non-zero exit code: 1",
 | 
| -      "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
 | 
|        "@@@STEP_FAILURE@@@"
 | 
|      ]
 | 
|    },
 | 
| @@ -826,7 +855,23 @@
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
|        "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
 | 
|      },
 | 
| -    "name": "Upload to test-results [ChromePublicTest]"
 | 
| +    "name": "ChromePublicTest with patch.Upload to test-results [ChromePublicTest]",
 | 
| +    "~followup_annotations": [
 | 
| +      "@@@STEP_NEST_LEVEL@1@@@"
 | 
| +    ]
 | 
| +  },
 | 
| +  {
 | 
| +    "cmd": [],
 | 
| +    "cwd": "[BUILDER_CACHE]/android",
 | 
| +    "env": {
 | 
| +      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
| +      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
 | 
| +    },
 | 
| +    "name": "ContentShellTest with patch",
 | 
| +    "~followup_annotations": [
 | 
| +      "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
 | 
| +      "@@@STEP_FAILURE@@@"
 | 
| +    ]
 | 
|    },
 | 
|    {
 | 
|      "cmd": [
 | 
| @@ -848,10 +893,10 @@
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
|        "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
 | 
|      },
 | 
| -    "name": "ContentShellTest (with patch)",
 | 
| +    "name": "ContentShellTest with patch.ContentShellTest (with patch)",
 | 
|      "~followup_annotations": [
 | 
| +      "@@@STEP_NEST_LEVEL@1@@@",
 | 
|        "step returned non-zero exit code: 1",
 | 
| -      "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
 | 
|        "@@@STEP_FAILURE@@@"
 | 
|      ]
 | 
|    },
 | 
| @@ -880,7 +925,23 @@
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
|        "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
 | 
|      },
 | 
| -    "name": "Upload to test-results [ContentShellTest]"
 | 
| +    "name": "ContentShellTest with patch.Upload to test-results [ContentShellTest]",
 | 
| +    "~followup_annotations": [
 | 
| +      "@@@STEP_NEST_LEVEL@1@@@"
 | 
| +    ]
 | 
| +  },
 | 
| +  {
 | 
| +    "cmd": [],
 | 
| +    "cwd": "[BUILDER_CACHE]/android",
 | 
| +    "env": {
 | 
| +      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
| +      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
 | 
| +    },
 | 
| +    "name": "ChromeSyncShellTest with patch",
 | 
| +    "~followup_annotations": [
 | 
| +      "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
 | 
| +      "@@@STEP_FAILURE@@@"
 | 
| +    ]
 | 
|    },
 | 
|    {
 | 
|      "cmd": [
 | 
| @@ -902,10 +963,10 @@
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
|        "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
 | 
|      },
 | 
| -    "name": "ChromeSyncShellTest (with patch)",
 | 
| +    "name": "ChromeSyncShellTest with patch.ChromeSyncShellTest (with patch)",
 | 
|      "~followup_annotations": [
 | 
| +      "@@@STEP_NEST_LEVEL@1@@@",
 | 
|        "step returned non-zero exit code: 1",
 | 
| -      "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
 | 
|        "@@@STEP_FAILURE@@@"
 | 
|      ]
 | 
|    },
 | 
| @@ -934,7 +995,10 @@
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
|        "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
 | 
|      },
 | 
| -    "name": "Upload to test-results [ChromeSyncShellTest]"
 | 
| +    "name": "ChromeSyncShellTest with patch.Upload to test-results [ChromeSyncShellTest]",
 | 
| +    "~followup_annotations": [
 | 
| +      "@@@STEP_NEST_LEVEL@1@@@"
 | 
| +    ]
 | 
|    },
 | 
|    {
 | 
|      "cmd": [
 | 
| @@ -1335,6 +1399,19 @@
 | 
|      ]
 | 
|    },
 | 
|    {
 | 
| +    "cmd": [],
 | 
| +    "cwd": "[BUILDER_CACHE]/android",
 | 
| +    "env": {
 | 
| +      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
| +      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
 | 
| +    },
 | 
| +    "name": "AndroidWebViewTest without patch",
 | 
| +    "~followup_annotations": [
 | 
| +      "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
 | 
| +      "@@@STEP_FAILURE@@@"
 | 
| +    ]
 | 
| +  },
 | 
| +  {
 | 
|      "cmd": [
 | 
|        "python",
 | 
|        "-u",
 | 
| @@ -1354,10 +1431,10 @@
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
|        "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
 | 
|      },
 | 
| -    "name": "AndroidWebViewTest (without patch)",
 | 
| +    "name": "AndroidWebViewTest without patch.AndroidWebViewTest (without patch)",
 | 
|      "~followup_annotations": [
 | 
| +      "@@@STEP_NEST_LEVEL@1@@@",
 | 
|        "step returned non-zero exit code: 1",
 | 
| -      "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
 | 
|        "@@@STEP_FAILURE@@@"
 | 
|      ]
 | 
|    },
 | 
| @@ -1386,7 +1463,23 @@
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
|        "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
 | 
|      },
 | 
| -    "name": "Upload to test-results [AndroidWebViewTest] (2)"
 | 
| +    "name": "AndroidWebViewTest without patch.Upload to test-results [AndroidWebViewTest]",
 | 
| +    "~followup_annotations": [
 | 
| +      "@@@STEP_NEST_LEVEL@1@@@"
 | 
| +    ]
 | 
| +  },
 | 
| +  {
 | 
| +    "cmd": [],
 | 
| +    "cwd": "[BUILDER_CACHE]/android",
 | 
| +    "env": {
 | 
| +      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
| +      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
 | 
| +    },
 | 
| +    "name": "ChromePublicTest without patch",
 | 
| +    "~followup_annotations": [
 | 
| +      "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
 | 
| +      "@@@STEP_FAILURE@@@"
 | 
| +    ]
 | 
|    },
 | 
|    {
 | 
|      "cmd": [
 | 
| @@ -1408,10 +1501,10 @@
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
|        "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
 | 
|      },
 | 
| -    "name": "ChromePublicTest (without patch)",
 | 
| +    "name": "ChromePublicTest without patch.ChromePublicTest (without patch)",
 | 
|      "~followup_annotations": [
 | 
| +      "@@@STEP_NEST_LEVEL@1@@@",
 | 
|        "step returned non-zero exit code: 1",
 | 
| -      "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
 | 
|        "@@@STEP_FAILURE@@@"
 | 
|      ]
 | 
|    },
 | 
| @@ -1440,7 +1533,23 @@
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
|        "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
 | 
|      },
 | 
| -    "name": "Upload to test-results [ChromePublicTest] (2)"
 | 
| +    "name": "ChromePublicTest without patch.Upload to test-results [ChromePublicTest]",
 | 
| +    "~followup_annotations": [
 | 
| +      "@@@STEP_NEST_LEVEL@1@@@"
 | 
| +    ]
 | 
| +  },
 | 
| +  {
 | 
| +    "cmd": [],
 | 
| +    "cwd": "[BUILDER_CACHE]/android",
 | 
| +    "env": {
 | 
| +      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
| +      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
 | 
| +    },
 | 
| +    "name": "ContentShellTest without patch",
 | 
| +    "~followup_annotations": [
 | 
| +      "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
 | 
| +      "@@@STEP_FAILURE@@@"
 | 
| +    ]
 | 
|    },
 | 
|    {
 | 
|      "cmd": [
 | 
| @@ -1462,10 +1571,10 @@
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
|        "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
 | 
|      },
 | 
| -    "name": "ContentShellTest (without patch)",
 | 
| +    "name": "ContentShellTest without patch.ContentShellTest (without patch)",
 | 
|      "~followup_annotations": [
 | 
| +      "@@@STEP_NEST_LEVEL@1@@@",
 | 
|        "step returned non-zero exit code: 1",
 | 
| -      "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
 | 
|        "@@@STEP_FAILURE@@@"
 | 
|      ]
 | 
|    },
 | 
| @@ -1494,7 +1603,23 @@
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
|        "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
 | 
|      },
 | 
| -    "name": "Upload to test-results [ContentShellTest] (2)"
 | 
| +    "name": "ContentShellTest without patch.Upload to test-results [ContentShellTest]",
 | 
| +    "~followup_annotations": [
 | 
| +      "@@@STEP_NEST_LEVEL@1@@@"
 | 
| +    ]
 | 
| +  },
 | 
| +  {
 | 
| +    "cmd": [],
 | 
| +    "cwd": "[BUILDER_CACHE]/android",
 | 
| +    "env": {
 | 
| +      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
| +      "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
 | 
| +    },
 | 
| +    "name": "ChromeSyncShellTest without patch",
 | 
| +    "~followup_annotations": [
 | 
| +      "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
 | 
| +      "@@@STEP_FAILURE@@@"
 | 
| +    ]
 | 
|    },
 | 
|    {
 | 
|      "cmd": [
 | 
| @@ -1516,10 +1641,10 @@
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
|        "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
 | 
|      },
 | 
| -    "name": "ChromeSyncShellTest (without patch)",
 | 
| +    "name": "ChromeSyncShellTest without patch.ChromeSyncShellTest (without patch)",
 | 
|      "~followup_annotations": [
 | 
| +      "@@@STEP_NEST_LEVEL@1@@@",
 | 
|        "step returned non-zero exit code: 1",
 | 
| -      "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
 | 
|        "@@@STEP_FAILURE@@@"
 | 
|      ]
 | 
|    },
 | 
| @@ -1548,7 +1673,10 @@
 | 
|        "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
 | 
|        "PATH": "[BUILDER_CACHE]/android/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android/src/build/android:%(PATH)s"
 | 
|      },
 | 
| -    "name": "Upload to test-results [ChromeSyncShellTest] (2)"
 | 
| +    "name": "ChromeSyncShellTest without patch.Upload to test-results [ChromeSyncShellTest]",
 | 
| +    "~followup_annotations": [
 | 
| +      "@@@STEP_NEST_LEVEL@1@@@"
 | 
| +    ]
 | 
|    },
 | 
|    {
 | 
|      "cmd": [
 | 
| 
 |