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

Change-Id: I9da9127f55ca0a8745a2761cc8f931440932e5e7