Merge "Switch using token_client to the recommended"