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