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

Change-Id: I342c96cb84c88b03262342d2014a18469f6ec5ba