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

Change-Id: I2d1e4c8f333d8e97e154ae999bf7e1d2cfca1cac