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

Change-Id: If24b9f82c451e9fcb8b8ef972fbad8e063a5e137