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

Change-Id: I0c3f52c12d789e16e5e340f3f6960caa3a00d2c0