Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c1bea24f38  -s ours am: 3da6753edf  -s ours"