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

Change-Id: Id57dcef4da9f9eac4f4eb8e8e88fcf37bd59588e