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

Change-Id: I4e65a2c460b3bcfa2e258a2952677b16d89e4d85