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