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