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

Change-Id: Ic51c4a45b77e227ace457b9665050be99af56ffc