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

Change-Id: Ia903a6127eee43bd4eac71869207da7634e22db7