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

Change-Id: I92f65c45249f1c28d2de36fe30ea2ad0a0efb6ee