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

Change-Id: I0c7cdc5f73d7e4cc05fc3b498d8d59439c3fe1ba