Merge "Stop sending underscores in header names to Swift"