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

Change-Id: Ied38bd3b8b0bf8a4f22bcc22af147664494c862a