Fix watch list

Change-Id: I1f6715911ec15502b732cff7db0a33efa609b814
Merge "Fix watch list"