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