Merge "watcheditem: Remove unused import/use statement"