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

Change-Id: I25d007ab1c375d6a017375c30e1e164bc0ee206f