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

Change-Id: I2d6f99108a1aa2a170aac8d50cc1cf3398223fd2