Added latest oauth2client changes