Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9da0a744c5  -s ours am: a56ea23d9c  -s ours"