Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 646773f4 -s ours am: eeaa000c -s ours"