Merge "Set default locale to US"