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

Change-Id: I09b7d1b6e45a95538eb722e95c7a7da22f55ce6b