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

Change-Id: I595bb334f082a052119a443eb7829c04921b5c28