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

Change-Id: I145af1b5541396059b944d8be28fa1e873f07010