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