Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 57c60d3b8c  -s ours am: ac2abee039  -s ours
am: 6a33a2a6d8  -s ours

Change-Id: I82a3af4d5a0b2f80f22b00bd281c38a695abfe8b