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

Change-Id: I4b26cbf3a5f9c5fadb88bb90db948bc605cd48e5