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

Change-Id: I2e7ae35b30cdf2c3f8b047f279e385d1a961b6c6