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

Change-Id: I38b81bad055650da23ac8b65ea0b4cba11382fa0