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

Change-Id: I832b38297a4c46fc0889059077ecfe5ffef61168