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

Change-Id: I32655854c6d45f0fb0959a55d502c44d5fe37988