Fix watch file


(cherry picked from commit 0f1e0e28)
29 jobs for cherry-pick-0f1e0e28 in 28 minutes and 28 seconds (queued for 4 minutes and 22 seconds)