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

Change-Id: I5689ca60c3bf9a29c59380c7d3002c6007f8eb05