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

Change-Id: Ie20e98c274593765c42349e8b94aaa063e31dbd2