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

Change-Id: I129fdafc703d9cb714a49c00c9367b520fc86519