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