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

Change-Id: I6aef4a656ed7bb29f04921dc5fc25ad5530c7ff7