Merge "Annotating a job test as flaky"