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

Change-Id: I8ed6ff2f40eebe612cf866c66867dc6adfbc0126