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

Change-Id: I44734403eba503fe12eb094e11998d01e6ebf084