Merge "Treat Latin American locales specially" into nyc-mr2-dev
am: 0e099a283e

Change-Id: I2af561b25f9023bc7970d653386b6ca94430be73