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

Change-Id: Ic0d5736c5d040abc951562fdc984359f76e9e348