Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 6eb3418ea7  -s ours

Change-Id: Iaabcd416d7c51bec1b821c709932fa758d9bc987