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

Change-Id: Iccdd50aca254ad54a1c34ec3dd1d37d494f04f7f