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

Change-Id: I84cd6ad222b419aee8c31c26a07922dd5c7d6746