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

Change-Id: I73062bba663f0c4456e626477f8a978436486dab