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

Change-Id: I3d2ad4363209ff05fc2dd5f50f0173ff6c748902