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

Change-Id: I1acc544f6cab8fdde4d7b66b110baf46114a3730