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

Change-Id: Ic394d68b3da185580e76cb3812cd9a57a05aa67c