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