Merge "Import translations. DO NOT MERGE am: 2c1d066618  -s ours" into oc-mr1-dev