Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: ddd95360a2  -s ours am: 8b35e8e64d  -s ours"