Merge "Treat Latin American locales specially" into nyc-mr2-dev