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