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

Change-Id: I651f2e52014577924e6505920b3dbf6a2e6ab5e9