Merge "Only create a TokenClient if api_v2 is enabled"