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

Change-Id: I9d561383cce7f5e979a920910f8556749bb67635