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

Change-Id: I5395bfa9fc7d8eaa051affe0d9139f8227c70709