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