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

Change-Id: Ia8f0b22ff3022f515caaa6bb772910bed67c2aee