Merge "Import translations. DO NOT MERGE" into oc-dev am: 995627c3ee  -s ours am: 899f5cf309  -s ours am: c260f7c6bb  -s ours
am: c25a18ea89  -s ours

Change-Id: I89e8b263009adfb28d6ac6c4d14a602e01094959