Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 040c26f636  -s ours

Change-Id: I696a2a7a8ca66a4f901640e4f83c6c31f2c43d4d