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

Change-Id: If0a6f3ad7aede027d34bdce9ca6cceb7457ea210