Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: a1c40c7077  -s ours am: 965d21f56b  -s ours"