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