Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 1c5bd422fd  -s ours am: 398be102c0  -s ours
am: e40dc673b7  -s ours

Change-Id: I8b6a606af41ddd3214f98f1b120da20d1b00f07b