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

Change-Id: Ibcdcd69068104c8db306d0b5d02276fd351064e6