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

Change-Id: Ia1425c1a21585764700000bf98fb25d3346bd639