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

Change-Id: I75374adc93f550c55e2d67e4464c304db95a8d7e