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

Change-Id: I602a57140ca17d6a15cac0a39b5565e8657fc12f