Merge "TokenManager: use secure tokens"