Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0fa3646a -s ours" into nyc-mr2-dev