Merge "Import translations. DO NOT MERGE" into oc-dev am: 327b9119d7  -s ours
am: 0c2bb34f5c  -s ours

Change-Id: I12f734080ccfbaa17c16b8664ebe266b10fa1a57