Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 7604fe28e8  -s ours
am: 3ea5aa121b  -s ours

Change-Id: If814f262b2f38fda17869d747b989a7c3a87ee1d