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

Change-Id: I9ca5dad4cd98b4d04d98858575e9f486be245e1f