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

Change-Id: I53aee6f670b5d08d1572f5542ede9cf9ded2bf3e