Merge "Import translations. DO NOT MERGE" into oc-dev am: 995627c3ee  -s ours am: 899f5cf309  -s ours am: 79ef7d950d  -s ours
am: 14b444880a  -s ours

Change-Id: I12eb8629933a6f48d7aa6dcebde0b5409f9a1bbb