Merge "Import translations. DO NOT MERGE" into oc-dev
am: 582a84640e  -s ours

Change-Id: I88dbdcea78f8532199965cd32d4d4c597052dcf7