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

Change-Id: Iac082addbf3aa178053f4eb27a91d0b842646898