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

Change-Id: Icf392e8e462ed9bb42b9b8b67850ab702078e559