Done. I made OAuth2Credentials inherit from GoogleCredentials, instead of Credentials. Hopefully this won't break the backwards compatibility.