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

Change-Id: I910d4fbdc298dfeaab4dd72f65079375a117c71b