Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 7fc501184a  -s ours" into oc-dr1-dev