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

Change-Id: I707bc618a85429e55a5ec60b4a430fe952e65fc2