Merge "Import translations. DO NOT MERGE" into oc-dev am: 69ca32dcea  -s ours am: 60af01bec9  -s ours am: 728b23a934  -s ours
am: 8bd92a279f  -s ours

Change-Id: Id8abbab3a751aa922d892953ecc8754ecfe8c583