Merge "TokenWatcher: fix bug in repeated calls to acquire()."