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

Change-Id: Ifa3fc1fa882eca341bda49a1af0bb57be0b92aa0