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

Change-Id: Ibf30adce3835b1023b40b814fe5dfb46dfd04d06