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

Change-Id: I0dd56302363757cbfa530844d35989568eb19d5c