I've been trying to test https://crrev.com/c/1316335 and https://crrev.com/c/1316819 using "cros tryjob --hwtest -g 1316335 -g 1316819 amd64-generic-paladin-tryjob".

My tryjob runs, e.g. http://cros-goldeneye/chromeos/healthmonitoring/buildDetails?buildbucketId=8930866868060517600, are failing in the Bootstrap stage with an error that doesn't make any sense to me, though:

---

08:30:44: INFO: Attempting to apply change derat:1316335:616e7895:"tast-tests: Add 4-minute timeout to arc.SettingsBridge."
08:30:44: INFO: Applying via cherry-pick.
Trying simple merge.
Simple merge failed, trying Automatic merge.
ERROR: src/chromiumos/tast/local/bundles/cros/arc/settings_bridge.go: Not handling case 4213dd1463f7badc3431ee43c04ce2c33245ac70 ->  -> f5d1c3508ef82cfa380c5217b6071aa22da8bf39
fatal: merge program failed
error: could not apply 616e7895d... tast-tests: Add 4-minute timeout to arc.SettingsBridge.
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
08:30:44: INFO: Rewinding transaction: failed changes: derat:1316335:616e7895:"tast-tests: Add 4-minute timeout to arc.SettingsBridge.", derat:1316819:7d70bc6d .
Traceback (most recent call last):
...
    raise ApplyPatchException(self, inflight=inflight, files=conflicts)
DependencyError: CL:1316819 depends on CL:1316335, which conflicted with ToT.

The conflicting files are amongst:

- src/chromiumos/tast/local/bundles/cros/arc/settings_bridge.go
...

---

This seems bogus to me. I've rebased https://crrev.com/c/1316335 on top of the current head, and Gerrit doesn't report any merge conflicts either. It should apply cleanly.