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

Change-Id: Ic092382ce5846801335c5d23aa105bb372a044e4