Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 970261b46c  -s ours
am: a683975c54  -s ours

Change-Id: I54b9b28c9ad38ad19c1e7f228e2e095dfd5cabe3