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

Change-Id: Idfe9a0140691a6e1347686ea8e663eb2376fc346