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

Change-Id: I2bfbaa9cc6b920112bc71a0b76b1382eb9d68e95