Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1ca34b5c7  -s ours
am: d5a7faea83  -s ours

Change-Id: Ie8542f341e8be8ea5d28f300773c0d49c6a16aab