QA: use newest watch locators, simplify

Change-Id: I3a4598246b8aa83667beb12b622c401684250f73
Merge "QA: use newest watch locators, simplify"