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

Change-Id: I3820c0c5decca7f1a839a40a65e9021fa6e999d1