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

Change-Id: Ic0ea2afd4dfc00234b97a66a9dafd993b35dd803