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

Change-Id: I24da3a236478e91b06710a4065ba29663921f940