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

Change-Id: I5a2bc34f8178d8a4c02de63495624e0cd45b3213