(bug 40665) Watch/Unwatch must be POSTed and pass token.

I think this was caused by r88522.

Change-Id: Ibb0fcba5d70cf7045d9280445f63ee4914ff9fc6
Merge "(bug 40665) Watch/Unwatch must be POSTed and pass token."