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

Change-Id: Id75778a6260e4cf090b4dd574654ff1e9e20ce93