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

Change-Id: I2dab29638f0813d6e52c9b4ec7b279b7ddcb06a0