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

Change-Id: Ia7f4b06b6f60dcb432d7303f918753ffb5f2c81c