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

Change-Id: I926c75446383b667bbc70d9e83fe686d6870ef4f