Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 2bf548f090  -s ours

Change-Id: I5742481d644f69145a6374fc351dc6feac6045a0