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

Change-Id: I42814eecb549e07d1ac562053e58eb2d27ed2234