fix WATCH/UNWATCH reversion

Change-Id: Ide1563a1d7b04bb57cb26dc607281224303c7c2f
Remove unused import

Change-Id: I678e8d291d3f651c9a15646eb0c92a04e1acf3c2
commit 3

Change-Id: I7704bfe65467964ce3ce511c2f064582e616b5fa