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

Change-Id: Ic7b1e9095cf413bd0401bd8d3cdfc469dd915988