Merge "Token Manager: use arbitrarily sized tokens."
am: c6a4ca733e

Change-Id: I384378d06181e9f261ba96e9c6e1d0cbd13f3052