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

Change-Id: Ifa6d01d8eeafd911be853b3404ffc704cfcd4e58