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

Change-Id: Ibd0a8fb760994424d34fa23f55b823e9dd2795f8