Merge "Revert "Import translations. DO NOT MERGE"" into oc-mr1-dev