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

Change-Id: Ic4efe5ee0cbbf8c14f6cde99f0254ce34aec1b20