Merge "Treat NO_CONTENT (204) responses as successful"