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

Change-Id: I6651874c16cb6f50d00797211baa5c6772a5c7d8