Merge "Import translations. DO NOT MERGE" into oc-dev am: 116c09f71d  -s ours
am: 6a26575076  -s ours

Change-Id: If2243523ee11b67e5df900a6811b9fa7db322b77