Merge "Import translations. DO NOT MERGE" into oc-dev
am: 6b1ff7073a  -s ours

Change-Id: Ic62eae25c60977a427a5414e73d7c6f08cf204a9