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

Change-Id: If3a6b958fa28dfc5f6486f1d2fc5e9018562f7b5