Merge "Revert "Prevents the UnknownApiNameOrVersion error while upgrading google-api-python-client.""