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

Change-Id: I220d3cca505d62ce3a4748e2d3ea850245fab07d