Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: b26da96c2c  -s ours" into nyc-mr1-dev