Merge "For locale negotiation, assume English is always supported"