Merge "Verify repeated calls to TokenWatcher.acquire() works." am: 9b63f52813 am: 48b933aa24
am: 5626898975

Change-Id: Ib0603dcc66c3652ad4cfec3118e6a26ebec32c41