Merge "Import translations. DO NOT MERGE" into cw-f-dev am: be30f0d5ea  -s ours
am: 3501a750e5  -s ours

Change-Id: I73d837e4e9e13c5f96f12405e875a9ac26f469c7