Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 3f9462d6a3  -s ours
am: 3b79072040  -s ours

Change-Id: I2355fc5b35b5fd65c04676336e77a7714e4c7925