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

Change-Id: I2a5b2fcf13844263dc5cc672bb54e390c72f8b39