Merge "Token Manager: use arbitrarily sized tokens."