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

Change-Id: I4aac6b37504d567110ba611376ea0b03c13f7b35