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

Change-Id: Ic6130156ebfe79b731b331ccf2dbb487839d831c