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

Change-Id: Ibcb59e3ae4e87301aa97fd7f7f3e93c64a2ef0f3