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

Change-Id: Ia8bef787b37b25450ad7ee694a11944685ece713