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

Change-Id: Ic16d4ee7269be24573cabf8a35e5c05ed7f0fed9