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

Change-Id: I71c5256dc9615712cb30881fc4fa312e172b881a