Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 341b700798  -s ours
am: c26f2d4d9b  -s ours

Change-Id: I82ac1078c8bbce7161cdb6731a744b2e27445206