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